Improved versioning script |Changed when versioning builder is called

LSTS · Nov 4, 2014 · 34ee61e · 34ee61e
1 parent c4684e7
commit 34ee61e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/.externalToolBuilders/versioning.launch b/.externalToolBuilders/versioning.launch
@@ -4,7 +4,7 @@
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/accu/versioning.sh}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/accu}"/>
 </launchConfiguration>
diff --git a/.project b/.project
@@ -17,7 +17,7 @@
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
+			<triggers>full,incremental,</triggers>
 			<arguments>
 				<dictionary>
 					<key>LaunchConfigHandle</key>

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="pt.lsts.accu"
       android:versionCode="7"
-      android:versionName="1.3.3-7-gb268366-dirty (master)">
+      android:versionName="1.3.3-8-gdsdfssc4684e7-dirty (master)">
     <instrumentation android:targetPackage="pt.up.fe.dceg.accu" android:name="android.test.InstrumentationTestRunner" />
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="pt.lsts.accu.App">
         <activity android:name="pt.lsts.accu.Main"

diff --git a/src/pt/lsts/accu/AboutPanel.java b/src/pt/lsts/accu/AboutPanel.java
@@ -26,7 +26,7 @@ public void onStart()
         TextView lab = (TextView)getLayout().findViewWithTag("lab");
 
         title.setText(Html.fromHtml(html));
-        String versionString = "1.3.3-7-gb268366-dirty (master)";
+        String versionString = "1.3.3-8-gc4684e7-dirty (master)";
         String dateString = "04-11-2014";
         version.setText("Version: "+versionString+"\n"+"Date: "+dateString+"\n"+"IMC version: " + IMCDefinition.getInstance().getVersion());
         authors.setText("Author: José Quadrado Correia");

diff --git a/versioning.sh b/versioning.sh
@@ -29,12 +29,8 @@ cat ./src/pt/lsts/accu/AboutPanel.java | \
 		-e "s/String dateString = \".*\";/String dateString = \"${DATE}\";/" \
 	> ./bin/AboutPanel.java
 
-rm AndroidManifest.xml
 cp bin/AndroidManifest.xml AndroidManifest.xml
-rm bin/AndroidManifest.xml
 
-rm ./src/pt/lsts/accu/AboutPanel.java
 cp ./bin/AboutPanel.java ./src/pt/lsts/accu/AboutPanel.java
-rm ./bin/AboutPanel.java
 
 exit 0