Merge remote branch 'upstream/master'

jantje · jantje · commit c78a0c3b778d · 2013-12-17T16:56:47.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,18 @@
 #Build the Arduino Eclipse Plugin using Maven
 
 node:
-#Make quiet to reduce logs (Travis will kill if 4MB log exceeded)
-#But not too quiet - see travis_exec_and_print_time.sh (Travis will kill after 10 mins of no output)
-#we also need to keep it under 75 mins
+#Make Maven builds quiet to reduce logs (Travis will kill the process if 4MB log exceeded)
+#But not too quiet - see travis_exec_and_print_time.sh for our timer (Travis will kill the process after 10 mins of no output)
+#Also needs to be kept under 75 mins (keep as short as possible as there are nice people making these servers free for our use)
 script:
-  #Check if we have access to our Nexus login details.
+  #Show if we have access to our Travis "secure" Nexus login details.
+  #If not available it is a pull request which we just verify
+  #If available it is a commit on the master and we deploy (to the Nexus repository)
   - sh -c "if $TRAVIS_SECURE_ENV_VARS; then echo Travis SECURE available -- Deploy; else echo Travis SECURE NOT available --  Verify; fi"
 
   #Execute the maven commands depending on SECURE availabilty and print the elapsed time out periodically.
-  #mvn deploy (or verify) -Pall,juno,kepler,luna --quiet --settings settings.xml
   - sh -c "if $TRAVIS_SECURE_ENV_VARS; then ./travis_exec_and_print_time.sh 'mvn deploy -Pall,juno,all,kepler,all,luna --quiet --settings settings.xml'; else ./travis_exec_and_print_time.sh 'mvn verify -Pall,juno,all,kepler,all,luna --quiet --settings settings.xml'; fi"
 
-  
-
 #Several usernames and passwords/tokens are required for deployment.
 #When testing on your local/remote setup then you need to set/export env. variables:
 #(See settings.xml)
@@ -29,24 +28,24 @@ env:
     #These are the Nexus details and GPG signing token for Nexus deployment.
     #The Nexus repo is hardcoded as com.github.brodykenrick.arduino-eclipse-plugin in the POM.XML (doing otherwise produces warnings)
     #This is good to use until we want more consistency in naming
-    #Travis encrypted variables names and tokens (need to change for correct repo though for encryption to work).
+    #Travis encrypted variables names and tokens (need to change triggering github repo for encryption to work).
     #Nexus Username, pass and GPG
     # These point to the above nexus server/groupid but need to be encrypted against the repo Travis is getting code from (i.e. change it).
-    #brodykenrick/arduino-eclipse-plugin
-#    - secure: "CkTScsFgbeqTznfGoAhhS0XRie2jr+syjpD3Vvn8Gw/OFCXkKjDEBWUebQdpJjXe9ia23dmTdQMFwp2HcPhrUj6cpnHNcOqVSfPRKfYPbYgXMmVSciGfqkgY3aWArddQ1G8SOMzivfYW6QZIkhanFsk00HkWOrYzxppXyA3m4GY="
-#    - secure: "bd0gCncNkyhwmIHkir2d7jprS+HNTd4DOVutYpIKQTVaJpvFKRw4anqZGMZp3wwxPyP3i30fMVvPoFJVCEphxRuJRomeqgrJJUpKAsh5QAIODYj9A2A8/KDa+jrTtbpPh16YAiMPmnMgq4NT3Wd5cjZuuBHxRmvaMMlb6BoJCO0="
-#    - secure: "oFSaKCjBm8L8ZgSvC3rAPKIXcXXJuEb+3eQ+lJbU84QK6C7wRd+2mz4fQ0E5GNSNxWACPbtypopUCPj4auCazhcbudO2wzpAksfJJpkIXd6vZN6xmxJLRzQWp7aNQG7a0UWvuY49/11IY834uhxPoJHBIFRh9jALHMLeF4epfko="
+
     #jantje/arduino-eclipse-plugin
     - secure: "kC8R35qKesohed2C47R2xO4uVKhRGahuO+7kEDaJwWIn7QlefJSgJ8IK9tGng+IcUUXD4ClKAT1RJgJnnchtO0jpUEy+MIXDQi1PCc2UkIsYa6XMw5Nf0EMppHiJM2LLbf1n/urGmuo/RwKWXLdC7SLuSmqgLD82AbrGA2xXSXM="
     - secure: "gUpJ6dlh/SBsJP+QlNFbNhchZzKRDmwuWjrId7lTyToVhAzoQSygNS7DfuemfJkhIdHVkZELnvfTx3FaeIfW59zQ2654HMiUrvUINFys+pq6C0vwPyQzAXg4KLn6kExgbn6md5zb8w2fE68Mb2y20jduhzBOAVWvK361lC4oeSI="
     - secure: "ZNF1Tc17sq5tsChKi4+yAv6mqhxOfq/zZ38TnRYr1zos2G1jCJJNw4zq1ojUGFViCxdt76xwlDYwavjzAMfsdI3/zoPePtaFJj3w8V6y4C10rgGW67bY4HwW2i0sudIbSWQ+skmG2zbVvJLrIMj2c6IXDM13sTW1Dv+Pt4tTaSs="
 
+    #Only for development work on brodykenrick's repo
+    #brodykenrick/arduino-eclipse-plugin
+#    - secure: "CkTScsFgbeqTznfGoAhhS0XRie2jr+syjpD3Vvn8Gw/OFCXkKjDEBWUebQdpJjXe9ia23dmTdQMFwp2HcPhrUj6cpnHNcOqVSfPRKfYPbYgXMmVSciGfqkgY3aWArddQ1G8SOMzivfYW6QZIkhanFsk00HkWOrYzxppXyA3m4GY="
+#    - secure: "bd0gCncNkyhwmIHkir2d7jprS+HNTd4DOVutYpIKQTVaJpvFKRw4anqZGMZp3wwxPyP3i30fMVvPoFJVCEphxRuJRomeqgrJJUpKAsh5QAIODYj9A2A8/KDa+jrTtbpPh16YAiMPmnMgq4NT3Wd5cjZuuBHxRmvaMMlb6BoJCO0="
+#    - secure: "oFSaKCjBm8L8ZgSvC3rAPKIXcXXJuEb+3eQ+lJbU84QK6C7wRd+2mz4fQ0E5GNSNxWACPbtypopUCPj4auCazhcbudO2wzpAksfJJpkIXd6vZN6xmxJLRzQWp7aNQG7a0UWvuY49/11IY834uhxPoJHBIFRh9jALHMLeF4epfko="
+
     # This is the Github username of the repository of the source we are building.
     #Needs to be inline with the repo being built (i.e. change it).
     - CI_GITHUB_REPOUSERNAME=jantje
+    #Only for development work on brodykenrick's repo
 #    - CI_GITHUB_REPOUSERNAME=brodykenrick
 
-
-
-
-
diff --git a/build_then_launch.sh b/build_then_launch.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-file_x86="./it.baeyens.arduino.product/target/products/it.baeyens.arduino.product/linux/gtk/x86/opt/eclipseArduino/eclipse"
-file_x86_64="./it.baeyens.arduino.product/target/products/it.baeyens.arduino.product/linux/gtk/x86_64/opt/eclipseArduino/eclipse"
+file_x86="./it.baeyens.arduino.product/target/products/it.baeyens.arduino.product/linux/gtk/x86/opt/eclipseArduino/eclipseArduinoIDE"
+file_x86_64="./it.baeyens.arduino.product/target/products/it.baeyens.arduino.product/linux/gtk/x86_64/opt/eclipseArduino/eclipseArduinoIDE"
 file=""
 
-echo "Trying to build and launch the Arduino Eclipse Plugin"
+echo "Trying to build and then launch the Arduino Eclipse IDE"
 
 echo "First we build with Maven. This may download a lot and take some time (it is downloading all Eclipse CDT for you)"
 mvn --version
@@ -21,7 +21,7 @@ if [[ $? -ne 0 ]] ; then
 fi
 
 
-echo "Now we find the Eclipse executable (with our plugin pre-packaged) and launch it"
+echo "Searching for the Eclipse executable (with our plugin pre-packaged) to launch"
 #Find an executable if we made it successfully
 if [[ -x "$file_x86" ]]
 then
@@ -44,7 +44,7 @@ then
     eval $file
     exit 0;
 else
-    echo "Did not find an Eclipse executable built....."
+    echo "Did not find an Eclipse Arduino IDE executable built....."
     exit 1;
 fi
 
diff --git a/images_plugin_dev_setup/ci_deploy_overview.png b/images_plugin_dev_setup/ci_deploy_overview.png
diff --git a/it.baeyens.arduino.application/pom.xml b/it.baeyens.arduino.application/pom.xml
@@ -3,12 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+    <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
     <artifactId>it.baeyens.arduino.parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../it.baeyens.arduino.parent</relativePath>
   </parent>
-  <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+  <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
   <artifactId>it.baeyens.arduino.application</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/it.baeyens.arduino.common/pom.xml b/it.baeyens.arduino.common/pom.xml
@@ -3,12 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+    <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
     <artifactId>it.baeyens.arduino.parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../it.baeyens.arduino.parent</relativePath>
   </parent>
-  <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+  <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
   <artifactId>it.baeyens.arduino.common</artifactId>
   <version>2.1.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/it.baeyens.arduino.core.nl1/pom.xml b/it.baeyens.arduino.core.nl1/pom.xml
@@ -3,12 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+    <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
     <artifactId>it.baeyens.arduino.parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../it.baeyens.arduino.parent</relativePath>
   </parent>
-  <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+  <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
   <artifactId>it.baeyens.arduino.core.nl1</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/it.baeyens.arduino.core/pom.xml b/it.baeyens.arduino.core/pom.xml
@@ -3,12 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+    <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
     <artifactId>it.baeyens.arduino.parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../it.baeyens.arduino.parent</relativePath>
   </parent>
-  <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+  <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
   <artifactId>it.baeyens.arduino.core</artifactId>
   <version>2.1.4-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/it.baeyens.arduino.feature/pom.xml b/it.baeyens.arduino.feature/pom.xml
@@ -3,12 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+    <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
     <artifactId>it.baeyens.arduino.parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../it.baeyens.arduino.parent</relativePath>
   </parent>
-  <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+  <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
   <artifactId>it.baeyens.arduino.feature</artifactId>
   <version>2.1.4-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/it.baeyens.arduino.monitor/pom.xml b/it.baeyens.arduino.monitor/pom.xml
@@ -3,12 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+    <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
     <artifactId>it.baeyens.arduino.parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../it.baeyens.arduino.parent</relativePath>
   </parent>
-  <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+  <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
   <artifactId>it.baeyens.arduino.monitor</artifactId>
   <version>2.1.8-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/it.baeyens.arduino.packaging.feature/pom.xml b/it.baeyens.arduino.packaging.feature/pom.xml
@@ -3,12 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+    <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
     <artifactId>it.baeyens.arduino.parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../it.baeyens.arduino.parent</relativePath>
   </parent>
-  <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+  <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
   <artifactId>it.baeyens.arduino.packaging.feature</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/it.baeyens.arduino.parent/pom.xml b/it.baeyens.arduino.parent/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-    <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+    <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
 	<artifactId>it.baeyens.arduino.parent</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
@@ -333,10 +333,12 @@
 
 		<profile>
 			<id>juno</id>
+            <properties>
+                <platform-version-name>juno</platform-version-name>
+            </properties>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
-
 			<repositories>
 				<repository>
 					<id>platform_juno</id>
@@ -354,6 +356,9 @@
 
 		<profile>
 			<id>kepler</id>
+            <properties>
+                <platform-version-name>kepler</platform-version-name>
+            </properties>
 			<repositories>
 				<repository>
 					<id>platform_kepler</id>
@@ -371,6 +376,9 @@
 
 		<profile>
 			<id>luna</id>
+            <properties>
+                <platform-version-name>luna</platform-version-name>
+            </properties>
 			<repositories>
 				<repository>
 					<id>platform_luna</id>
diff --git a/it.baeyens.arduino.product/pom.xml b/it.baeyens.arduino.product/pom.xml
@@ -4,12 +4,12 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-        <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+        <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
 		<artifactId>it.baeyens.arduino.parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
     <relativePath>../it.baeyens.arduino.parent</relativePath>
 	</parent>
-    <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+    <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
 	<artifactId>it.baeyens.arduino.product</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
@@ -44,6 +44,10 @@
 						<product>
 							<!-- id is verbatim to todo.product "uid" -->
 							<id>it.baeyens.arduino.product</id>
+							<!-- Customise the packaged product's archive name (Instead of "it.baeyens.arduino.product")
+							    Suffix is still <os>.<ws>.<arch>.<archiveExtension> (e.g. linux.gtk.x86_64.tar.gz)
+							 -->
+                            <archiveFileName>EclipseArduinoIDE-${platform-version-name}</archiveFileName>
 							<!-- Causes the archives to contain a folder todo/ that contains the 
 								application -->
 							<!-- Without it, the application is at the archive root -->
diff --git a/it.baeyens.arduino.updatesite/pom.xml b/it.baeyens.arduino.updatesite/pom.xml
@@ -4,12 +4,12 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-        <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+        <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
 		<artifactId>it.baeyens.arduino.parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
         <relativePath>../it.baeyens.arduino.parent</relativePath>
 	</parent>
-    <groupId>com.github.baeyens.arduino-eclipse-plugin</groupId>
+    <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
 	<artifactId>it.baeyens.arduino.updatesite</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.github.arduino-eclipse-plugin</groupId>
+  <groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
   <artifactId>root</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
diff --git a/readme.md b/readme.md
@@ -8,6 +8,9 @@ The Arduino Eclipse Plugin bridges that gap and helps move you to a more powerfu
 
 It works on MS Windows, Mac OSX and Linux.
 
+##Are you a regular user?
+If you are a regular user and don't want to build from source then there are precompiled product packages and update sites available. See the details at http://www.baeyens.it/eclipse/.
+
 ##Quick Installation 
 ###Prerequisites
 
@@ -26,7 +29,7 @@ open it.baeyens.arduino.product/target/products/it.baeyens.arduino.product/macos
 
 for Linux you can run the verify and start eclipse in on command:
 
-./launch_plugin.sh
+./build_then_launch_plugin.sh
 
 
 ###Running the IDE/Plugin
@@ -36,12 +39,12 @@ win32x64.cmd (if you are on 64 bits windows)
 
 win32x32.cmd (if you are on 32 bits windows)
 
-./launch_plugin.sh (Mac OSX and Linux)
+./build_then_launch_plugin.sh (Mac OSX and Linux)
 
 
 =======
 ##Build Options
-You can control the build with the following profiles:
+You can control the maven build with the following profiles:
 * juno (default) (builds against the juno repositories (4.2))
 * kepler (builds agains the kepler repositories (4.3))
 * luna (builds agains the luna repositories (4.4))
diff --git a/readme_travis_deploy.md b/readme_travis_deploy.md
diff --git a/travis_exec_and_print_time.sh b/travis_exec_and_print_time.sh
