making booster ready for 1.1 release

secure-software-engineering · Aug 4, 2010 · 35053fe · 35053fe
1 parent 59a49d6
commit 35053fe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/Booster/.classpath b/Booster/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/sootclasses-trunk.jar"/>
+	<classpathentry kind="lib" path="lib/soot-svn3509.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Booster/build.xml b/Booster/build.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="tamiflex-booster" default="default">
+    <property file="ant.settings"/>
+
     <description>
             description
     </description>
@@ -17,7 +19,7 @@
         	fork="true"
         >
         	<classpath>
-        		<pathelement location="lib/sootclasses-trunk.jar"/>
+        		<pathelement location="lib/soot-${soot.version}.jar"/>
         	</classpath>
             <src path="src"/>
         </javac>
@@ -27,12 +29,13 @@
     	<mkdir dir="META-INF"/>
 
         <manifest file="META-INF/MANIFEST.MF">
-           <attribute name="Main-Class" value="ReflInliner"/>
+           <attribute name="Main-Class" value="de.bodden.tamiflex.booster.ReflInliner"/>
+           <attribute name="Implementation-Version" value="${tf.version}"/> 
         </manifest>
-
-    	<jar destfile="lib/booster.jar" manifest="META-INF/MANIFEST.MF">
+		
+    	<jar destfile="lib/booster-${tf.version}.jar" manifest="META-INF/MANIFEST.MF">
             <fileset dir="bin"/>
-            <zipfileset src="lib/sootclasses-trunk.jar"/>
+            <zipfileset src="lib/soot-${soot.version}.jar"/>
         </jar>
 		<delete dir="META-INF"/>
 	</target>

diff --git a/Booster/lib/soot-svn3509.jar b/Booster/lib/soot-svn3509.jar
diff --git a/Booster/src/ReflInliner.java → .../bodden/tamiflex/booster/ReflInliner.java b/Booster/src/ReflInliner.java → .../bodden/tamiflex/booster/ReflInliner.java
@@ -1,3 +1,4 @@
+package de.bodden.tamiflex.booster;
 /*******************************************************************************
  * Copyright (c) 2010 Eric Bodden.
  * All rights reserved. This program and the accompanying materials
@@ -47,7 +48,7 @@ public static void main(String[] args) {
 
 		Options.v().set_keep_line_number(true);
 
-		G.v().out.println("TamiFlex Booster");
+		G.v().out.println("TamiFlex Booster Version "+ReflInliner.class.getPackage().getImplementationVersion());
 		try {
 			soot.Main.main(argList.toArray(new String[0]));
 		} catch(CompilationDeathException e) {