Skip to content

Commit

Permalink
CLOSED - task 3: Add mono path to preferences
Browse files Browse the repository at this point in the history
http://github.com/smackers/smackd/issues/issue/3

Also, new release, plus changed version numbering scheme to
major.minor.bug.
  • Loading branch information
MontyCarter committed May 6, 2014
1 parent e37a272 commit 6987caf
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion org.smackers.smack.feature/category.xml
Original file line number Diff line number Diff line change
@@ -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&apos;D"/>
Expand Down
10 changes: 6 additions & 4 deletions org.smackers.smack.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
<feature
id="org.smackers.smack.feature"
label="SMACK&apos;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&apos;D is an Eclipse plugin for visually debugging software
analyzed by SMACK.
</description>

<copyright url="http://www.example.com/copyright">
Expand All @@ -17,7 +19,7 @@
</license>

<url>
<update label="SMACK&apos;D" url="http://snoopsmsc.github.io/smackd"/>
<update label="SMACK&apos;D" url="http://smackers.github.io/smackd"/>
</url>

<plugin
Expand Down
2 changes: 1 addition & 1 deletion org.smackers.smack/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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
Expand Down
Binary file modified release/artifacts.jar
Binary file not shown.
Binary file modified release/content.jar
Binary file not shown.
Binary file removed release/features/org.smackers.smack.feature_1.0.0.2.jar
Binary file not shown.
Binary file not shown.
Binary file removed release/plugins/org.smackers.smack_1.0.0.2.jar
Binary file not shown.
Binary file added release/plugins/org.smackers.smack_1.1.0.jar
Binary file not shown.

0 comments on commit 6987caf

Please sign in to comment.