diff --git a/org.smackers.smack.feature/category.xml b/org.smackers.smack.feature/category.xml index 6d4fb9d..f5a83ad 100644 --- a/org.smackers.smack.feature/category.xml +++ b/org.smackers.smack.feature/category.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature url="features/org.smackers.smack.feature_1.0.0.2.jar" id="org.smackers.smack.feature" version="1.0.0.2"> + <feature url="features/org.smackers.smack.feature_1.1.0.jar" id="org.smackers.smack.feature" version="1.1.0"> <category name="smackd"/> </feature> <category-def name="smackd" label="SMACK'D"/> diff --git a/org.smackers.smack.feature/feature.xml b/org.smackers.smack.feature/feature.xml index 35dcbfe..aa8d245 100644 --- a/org.smackers.smack.feature/feature.xml +++ b/org.smackers.smack.feature/feature.xml @@ -2,10 +2,12 @@ <feature id="org.smackers.smack.feature" label="SMACK'D" - version="1.0.0.2"> + version="1.1.0" + provider-name="smackers"> - <description url="http://www.example.com/description"> - [Enter Feature Description here.] + <description url="http://smackers.github.io/smackd"> + SMACK'D is an Eclipse plugin for visually debugging software +analyzed by SMACK. </description> <copyright url="http://www.example.com/copyright"> @@ -17,7 +19,7 @@ </license> <url> - <update label="SMACK'D" url="http://snoopsmsc.github.io/smackd"/> + <update label="SMACK'D" url="http://smackers.github.io/smackd"/> </url> <plugin diff --git a/org.smackers.smack/META-INF/MANIFEST.MF b/org.smackers.smack/META-INF/MANIFEST.MF index 0729837..7d1e333 100644 --- a/org.smackers.smack/META-INF/MANIFEST.MF +++ b/org.smackers.smack/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: SMACK'D Bundle-SymbolicName: org.smackers.smack;singleton:=true -Bundle-Version: 1.0.0.2 +Bundle-Version: 1.1.0 Bundle-Activator: org.smackers.smack.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/org.smackers.smack/src/org/smackers/smack/preferences/PreferenceConstants.java b/org.smackers.smack/src/org/smackers/smack/preferences/PreferenceConstants.java index c882f5d..f035af4 100644 --- a/org.smackers.smack/src/org/smackers/smack/preferences/PreferenceConstants.java +++ b/org.smackers.smack/src/org/smackers/smack/preferences/PreferenceConstants.java @@ -13,6 +13,8 @@ public class PreferenceConstants { public static final String CORRAL_BIN = "corralBinPathPreference"; + public static final String MONO_BIN = "monoBinPathPreference"; + public static final String DEBUG_MODE = "debugModePreference"; public static final String LOG_FILE = "logFilePreference"; diff --git a/org.smackers.smack/src/org/smackers/smack/preferences/PreferenceInitializer.java b/org.smackers.smack/src/org/smackers/smack/preferences/PreferenceInitializer.java index a68b3e2..517de3f 100644 --- a/org.smackers.smack/src/org/smackers/smack/preferences/PreferenceInitializer.java +++ b/org.smackers.smack/src/org/smackers/smack/preferences/PreferenceInitializer.java @@ -21,6 +21,7 @@ public void initializeDefaultPreferences() { store.setDefault(PreferenceConstants.SMACK_BIN, "/usr/local/smack-project/smack/install/bin"); store.setDefault(PreferenceConstants.BOOGIE_BIN, "/usr/local/smack-project/boogie/Binaries"); store.setDefault(PreferenceConstants.CORRAL_BIN, "/usr/local/smack-project/corral/bin"); + store.setDefault(PreferenceConstants.MONO_BIN, "/usr/bin"); store.setDefault(PreferenceConstants.DEBUG_MODE, true); store.setDefault(PreferenceConstants.LOG_FILE, "/tmp/smackd_log.log"); } diff --git a/org.smackers.smack/src/org/smackers/smack/preferences/SmackPreferences.java b/org.smackers.smack/src/org/smackers/smack/preferences/SmackPreferences.java index 576cbbf..85b0b3c 100644 --- a/org.smackers.smack/src/org/smackers/smack/preferences/SmackPreferences.java +++ b/org.smackers.smack/src/org/smackers/smack/preferences/SmackPreferences.java @@ -52,6 +52,10 @@ public void createFieldEditors() { "Corral bin Path:", getFieldEditorParent())); + addField(new DirectoryFieldEditor( PreferenceConstants.MONO_BIN, + "Mono bin Path:", + getFieldEditorParent())); + addField(new BooleanFieldEditor( PreferenceConstants.DEBUG_MODE, "Debug mode:", getFieldEditorParent())); diff --git a/org.smackers.smack/src/org/smackers/smack/util/TraceParser.java b/org.smackers.smack/src/org/smackers/smack/util/TraceParser.java index e9cd833..d464bc5 100644 --- a/org.smackers.smack/src/org/smackers/smack/util/TraceParser.java +++ b/org.smackers.smack/src/org/smackers/smack/util/TraceParser.java @@ -75,6 +75,7 @@ public static String execSmack(String filename) { String llvmbin = preferenceStore.getString(PreferenceConstants.LLVM_BIN); String boogiebin = preferenceStore.getString(PreferenceConstants.BOOGIE_BIN); String corralbin = preferenceStore.getString(PreferenceConstants.CORRAL_BIN); + String monobin = preferenceStore.getString(PreferenceConstants.MONO_BIN); String cmd = "smack-verify.py"; @@ -96,10 +97,10 @@ public static String execSmack(String filename) { //Add the command aliases expected by smack-verify.py //TODO User path builder instead, to handle trailing '/' on paths (see java.io.File, new File(baseDirFile,subdirStr)) //TODO Can we assume mono in path? - String boogieVar = "mono " + boogiebin + "/Boogie.exe"; + String boogieVar = monobin + "/mono " + boogiebin + "/Boogie.exe"; env.put("BOOGIE", boogieVar); log.write(Logger.SMACK_ENV, "BOOGIE: " + boogieVar); - String corralVar = "mono " + corralbin + "/Debug/corral.exe"; + String corralVar = monobin + "/mono " + corralbin + "/Debug/corral.exe"; env.put("CORRAL", corralVar); log.write(Logger.SMACK_ENV, "CORRAL: " + corralVar); // Start process diff --git a/release/artifacts.jar b/release/artifacts.jar index f4ba94f..e42ce3b 100644 Binary files a/release/artifacts.jar and b/release/artifacts.jar differ diff --git a/release/content.jar b/release/content.jar index a561942..b822562 100644 Binary files a/release/content.jar and b/release/content.jar differ diff --git a/release/features/org.smackers.smack.feature_1.0.0.2.jar b/release/features/org.smackers.smack.feature_1.0.0.2.jar deleted file mode 100644 index 5c76655..0000000 Binary files a/release/features/org.smackers.smack.feature_1.0.0.2.jar and /dev/null differ diff --git a/release/features/org.smackers.smack.feature_1.1.0.jar b/release/features/org.smackers.smack.feature_1.1.0.jar new file mode 100644 index 0000000..3bb0d61 Binary files /dev/null and b/release/features/org.smackers.smack.feature_1.1.0.jar differ diff --git a/release/plugins/org.smackers.smack_1.0.0.2.jar b/release/plugins/org.smackers.smack_1.0.0.2.jar deleted file mode 100644 index 4179adc..0000000 Binary files a/release/plugins/org.smackers.smack_1.0.0.2.jar and /dev/null differ diff --git a/release/plugins/org.smackers.smack_1.1.0.jar b/release/plugins/org.smackers.smack_1.1.0.jar new file mode 100644 index 0000000..fd6b8a4 Binary files /dev/null and b/release/plugins/org.smackers.smack_1.1.0.jar differ