From 4acce053059a22fcc31e243a210c363bb6b694a8 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Mon, 6 Jan 2020 13:33:30 +0300 Subject: [PATCH] Bug 558826 - Fix branding issues for org.eclipse.cdt.arduino-feature Fixed license headers Normalized IU names Added branding image Change-Id: Ib956df90c3a755219f2305b837186e273cf9def6 Signed-off-by: Alexander Fedorov --- .../build.properties | 15 +++++++++++++++ .../feature.properties | 7 ++++--- .../feature.xml | 13 +++++++++++++ .../META-INF/MANIFEST.MF | 6 +++--- .../OSGI-INF/l10n/bundle.properties | 18 ++++++++++++++++++ .../build.properties | 16 ++++++++++++++++ .../build.properties | 15 +++++++++++++++ .../plugin.properties | 6 ++++-- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 18 +++++++++++++++++- .../cdt_logo_icon32.png | Bin 0 -> 1885 bytes .../plugin.properties | 6 ++++-- 12 files changed, 110 insertions(+), 12 deletions(-) create mode 100644 toolchains/arduino/org.eclipse.cdt.arduino.core.tests/OSGI-INF/l10n/bundle.properties create mode 100644 toolchains/arduino/org.eclipse.cdt.arduino.ui/cdt_logo_icon32.png diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/build.properties b/toolchains/arduino/org.eclipse.cdt.arduino-feature/build.properties index b3a611b5c93..93357407399 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino-feature/build.properties +++ b/toolchains/arduino/org.eclipse.cdt.arduino-feature/build.properties @@ -1,2 +1,17 @@ +############################################################################### +# Copyright (c) 2015-2020 QNX Software Systems and others. +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# QNX Software Systems - initial API and implementation +# Alexander Fedorov - ongoing support +############################################################################### + bin.includes = feature.xml,\ feature.properties diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.properties b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.properties index 61426790cad..4cd3859751c 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.properties +++ b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2015 QNX Software Systems and others +# Copyright (c) 2015-2020 QNX Software Systems and others. # # This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -10,6 +10,7 @@ # # Contributors: # QNX Software Systems - initial API and implementation +# Alexander Fedorov - ongoing support ############################################################################### # features.properties # contains externalized strings for feature.xml @@ -18,7 +19,7 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Arduino C++ Tools +featureName=C/C++ Arduino Tools # "providerName" property - name of the company that provides the feature providerName=Eclipse CDT @@ -28,7 +29,7 @@ description=Extensions to support Arduino C++ projects in Eclipse # copyright copyright=\ -Copyright (c) 2015 QNX Software Systems and others.\n\ +Copyright (c) 2015-2020 QNX Software Systems and others.\n\ This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License 2.0\n\ which accompanies this distribution, and is available at\n\ diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml index 6d1e9759b40..42778c25378 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml +++ b/toolchains/arduino/org.eclipse.cdt.arduino-feature/feature.xml @@ -1,4 +1,17 @@ + - ongoing support +############################################################################### + +Bundle-Vendor = Eclipse CDT +Bundle-Name = C/C++ Arduino Tests \ No newline at end of file diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/build.properties b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/build.properties index 9cbab3c135e..d3a102f70f3 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/build.properties +++ b/toolchains/arduino/org.eclipse.cdt.arduino.core.tests/build.properties @@ -1,6 +1,22 @@ +############################################################################### +# Copyright (c) 2015-2020 QNX Software Systems and others. +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# QNX Software Systems - initial API and implementation +# Alexander Fedorov - ongoing support +############################################################################### + source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ + OSGI-INF/,\ about.html src.includes = about.html diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties b/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties index 3b6cc63ded6..1a2c7ede3c8 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties +++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties @@ -1,3 +1,18 @@ +############################################################################### +# Copyright (c) 2015-2020 QNX Software Systems and others. +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# QNX Software Systems - initial API and implementation +# Alexander Fedorov - ongoing support +############################################################################### + source.. = src/ bin.includes = META-INF/,\ .,\ diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties b/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties index 722cf64af6f..4950b170491 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties +++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2015 QNX Software Systems and others. +# Copyright (c) 2015-2020 QNX Software Systems and others. # # This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -10,8 +10,10 @@ # # Contributors: # QNX Software Systems - initial API and implementation +# Alexander Fedorov - ongoing support ############################################################################### -pluginName=Arduino C++ Core + +pluginName=C/C++ Arduino Core providerName=Eclipse CDT ArduinoBuilder.name=Arduino Builder arduinonature.name=Arduino Nature \ No newline at end of file diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF b/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF index 0b8d8958dfe..9656501b8e0 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF +++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.arduino.ui;singleton:=true -Bundle-Version: 2.1.400.qualifier +Bundle-Version: 2.1.500.qualifier Bundle-Activator: org.eclipse.cdt.arduino.ui.internal.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.expressions, diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties b/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties index 1bf1db9f601..18900cdf5f3 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties +++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties @@ -1,8 +1,24 @@ +############################################################################### +# Copyright (c) 2015-2020 QNX Software Systems and others. +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# QNX Software Systems - initial API and implementation +# Alexander Fedorov - ongoing support +############################################################################### + bin.includes = META-INF/,\ .,\ plugin.xml,\ icons/,\ about.html,\ - plugin.properties + plugin.properties,\ + cdt_logo_icon32.png source.. = src/ src.includes = about.html diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/cdt_logo_icon32.png b/toolchains/arduino/org.eclipse.cdt.arduino.ui/cdt_logo_icon32.png new file mode 100644 index 0000000000000000000000000000000000000000..470ca81b327234a519c2a443515e85727409b5f4 GIT binary patch literal 1885 zcmV-j2cr0iP)!H^1ntgMx$mQ^a+I-;$Ws3z8GYqX(iXst@JwrY8nR6N2$5hQdjkl4<{u^qpz z?d$vAABiL5I?h--Z9nP$^PTUU@Ao_B+;hGI{Evg&ZU?&_cApis05Hm7G%X$~QC}(f-LgFHq8$YV5GWUfO@Y&&e z=IeO2a}heb&KSCn2bXwkmWC&EjL}=EpQ_6Fbawo$X!6<%g2er^5|^HZlrrGdhzkH3D^y=pV@;xrv=WnFMDJJ zD2gd2D~gm!W&&?Sl0*9xMZBew*#QY*9F~UdHLg3mXj*3};HgaL$aw714n-B?#r#=; zAGG6#ZPjRfx|e>Q=-Pf(DlRKxYGUe>U8zj)F92XRRNZGY`@XMdZ7T?&SV_u_WcbPV zQ`z9*1UGyrmyexk@UA^Z2xW*QhMtS3ZyYR}FaTIsSpKmG12z+E?Jw8tb~!uWEG3Rd z2X@A}o4;phgV*a>dC+EBxT)O6%!}!3p~$&M1TlS8ud}ugLL2j9a-f_z08jvMcP&;m zyRfu(5WN&r_h2b0ot^mmw79;iuDYYgZuUJi*I!{^Z7qwv_x0%*<03)gu2m8TW|m-m z6V^imj`^9h7E|?0rKDK$(-#4t%F*(?$>3@);F6q=WckQ3Rg-fTQ_TY`WAaIIJ~|n{ zvR9J%P$l785@`3L9V&1+Y#1X3!YGQw0h%@~!UuE0)LEKh-F9>B7DW-$03m{u9t=*N z-7G8laR4BMVmv|4@YeP7u>q z6Ws7?voqk-!^!dB2+@0NX5Ygz;u-*C_{ecd&IMSVrP*roZUg{Dm6DYbplQ9wWo_JL zWSy&6#-{|RppGP zDcPCX$^w9<%Gn|;Q{XZHkjNoX??k;Mr>@4+H(o6stZ;tk^07Wi&IKz87edpNd@SWZ zz%WK%@e<5nwZ%(70N{hI`0$&JxPQg#j_(oEy1y0=CdquzA9`;wO|kCgx^IOjLg@iO z5V@g1xNn1`@M8c#Q>@G5Xx^LTg58BpNC<5JG_`mWmSQvjEO%o?XDvEU2l8))rKWGt zl+HwEf~HwVCO7$kC};dS+Tb-A++QPv5QZ@C8>ZOyEzseDtK*SiM2V z7#9KnMJSz~wKf}AduzcbOk?)D(%I1?sw$`FTP_L!P6ct&AIE1~?!XpR3cgcHvKSZK z>#{ZOR5gVk34gRM!3F-TY18LKY2@q-szfT82&I z>CCw+@oJlnG1V3m&Bp2t(zNI6=W^q3XZY~DiYg@(MM{ctE|BFTC!)zu_fICS?3EQE zY}7mNuB+~N$8BqRO4C#^Cro`@E`izeoFz?CW|;Z$wSgv}7jG zJsH39w5$lxvK3J}hr`;ieSu^7FN?2ZE<5q=XtaM@>2-X|h0<1qJI_Cc^Ctp0@#OKA zi*p$gMV0w!LlQkDO1WV`l^NPlW7NCuv6+1j7xqYLR5T=oc%%he4u1!S_w`}lA3s~Q z^vkkjypR|e3HPlpwPc@j#e*>nj-(LiT8FN@F!A2$AbrlLcXxadQ<~u;r$duxHz{S7 zt*kA-9Kq#}Msa5UTD*9NJ(4`?PaR-%RcmO9G2f1`tcb~2%HK5}8~E{DzhuR#9C|pO zS&e5mFT>`S&NHv}1eO@>)}~$aJxpXdA4})P-;SmH2Sh33uf+YgrqyGFXX|o2+Uh~; zScZfzOuG2XQ*Ns8G$SCiqDqCQS${SkIq{`D&B_H$K-b!^$gG1oltzdXG4E;je;xk< X7GP-TgL9xq00000NkvXXu0mjf1*xYU literal 0 HcmV?d00001 diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties b/toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties index 9a391e73fb5..be5a59fd496 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties +++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2015 QNX Software Systems and others. +# Copyright (c) 2015-2020 QNX Software Systems and others. # # This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -10,8 +10,10 @@ # # Contributors: # QNX Software Systems - initial API and implementation +# Alexander Fedorov - ongoing support ############################################################################### -pluginName=Arduino C++ UI + +pluginName=C/C++ Arduino UI providerName=Eclipse CDT preferencePage.name=Arduino