Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<classpathentry kind="lib" path="prism/lib/jfreechart.jar"/>
<classpathentry kind="lib" path="prism/lib/jhoafparser.jar"/>
<classpathentry kind="lib" path="prism/lib/colt.jar"/>
<classpathentry kind="lib" path="prism/lib/pepa.zip"/>
<classpathentry kind="lib" path="prism/lib/pepa.jar"/>
<classpathentry kind="lib" path="prism/lib/lpsolve55j.jar"/>
<classpathentry kind="lib" path="prism/lib/jas.jar"/>
<classpathentry kind="lib" path="prism/lib/log4j-api.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion prism/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<classpathentry kind="lib" path="lib/jfreechart.jar" sourcepath="/jfreechart/source"/>
<classpathentry kind="lib" path="lib/jhoafparser.jar"/>
<classpathentry kind="lib" path="lib/colt.jar" sourcepath="/Users/dxp/colt/src"/>
<classpathentry kind="lib" path="lib/pepa.zip"/>
<classpathentry kind="lib" path="lib/pepa.jar"/>
<classpathentry kind="lib" path="lib/lpsolve55j.jar"/>
<classpathentry kind="lib" path="lib/jas.jar"/>
<classpathentry kind="lib" path="lib/log4j-core.jar"/>
Expand Down
3 changes: 1 addition & 2 deletions prism/src/bin/prism.bat.win
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ rem Set up CLASSPATH:
rem - PRISM jar file (for binary versions) (gets priority)
rem - classes directory (most PRISM classes)
rem - top-level directory (for images, dtds)
rem - lib/pepa.zip (PEPA stuff)
rem - lib/*.jar (all other jars)
set CP=%PRISM_DIR%\lib\prism.jar;%PRISM_DIR%\classes;%PRISM_DIR%;%PRISM_DIR%\lib\pepa.zip;%PRISM_DIR%\lib\*
set CP=%PRISM_DIR%\lib\prism.jar;%PRISM_DIR%\classes;%PRISM_DIR%;%PRISM_DIR%\lib\*

rem Run PRISM through Java
java -Xss4M -Djava.library.path="%PRISM_DIR%\lib" -classpath "%CP%" prism.PrismCL %*
3 changes: 1 addition & 2 deletions prism/src/bin/prism.cygwin
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,8 @@ done
# - PRISM jar file (for binary versions) (gets priority)
# - classes directory (most PRISM classes)
# - top-level directory (for images, dtds)
# - lib/pepa.zip (PEPA stuff)
# - lib/*.jar (all other jars)
PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/pepa.zip:"$PRISM_DIR"/lib/*
PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/*

# Set up pointers to libraries
PRISM_LIB_PATH="$PRISM_DIR"/lib
Expand Down
3 changes: 1 addition & 2 deletions prism/src/bin/prism.darwin
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ done
# - PRISM jar file (for binary versions) (gets priority)
# - classes directory (most PRISM classes)
# - top-level directory (for images, dtds)
# - lib/pepa.zip (PEPA stuff)
# - lib/*.jar (all other jars)
PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/pepa.zip:"$PRISM_DIR"/lib/*
PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/*

# Set up pointers to libraries
PRISM_LIB_PATH="$PRISM_DIR"/lib
Expand Down
3 changes: 1 addition & 2 deletions prism/src/bin/prism.linux
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,8 @@ done
# - PRISM jar file (for binary versions) (gets priority)
# - classes directory (most PRISM classes)
# - top-level directory (for images, dtds)
# - lib/pepa.zip (PEPA stuff)
# - lib/*.jar (all other jars)
PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/pepa.zip:"$PRISM_DIR"/lib/*
PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/*

# Set up pointers to libraries
PRISM_LIB_PATH="$PRISM_DIR"/lib
Expand Down
3 changes: 1 addition & 2 deletions prism/src/bin/xprism.bat.win
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ rem Set up CLASSPATH:
rem - PRISM jar file (for binary versions) (gets priority)
rem - classes directory (most PRISM classes)
rem - top-level directory (for images, dtds)
rem - lib/pepa.zip (PEPA stuff)
rem - lib/*.jar (all other jars)
set CP=%PRISM_DIR%\lib\prism.jar;%PRISM_DIR%\classes;%PRISM_DIR%;%PRISM_DIR%\lib\pepa.zip;%PRISM_DIR%\lib\*
set CP=%PRISM_DIR%\lib\prism.jar;%PRISM_DIR%\classes;%PRISM_DIR%;%PRISM_DIR%\lib\*

rem Run PRISM through Java
start "PRISM" javaw -Xmx1g -Xss4M -Djava.library.path="%PRISM_DIR%\lib" -classpath "%CP%" userinterface/GUIPrism %*
Expand Down
1 change: 0 additions & 1 deletion prism/src/manifest.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Main-Class: userinterface.GUIPrism
Class-Path: pepa.zip
2 changes: 1 addition & 1 deletion prism/src/pepa/compiler/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static String compile(String fileName) throws InternalError {

return PRISM_result;
} catch (ClassNotFoundException cnfe) {
throw new InternalError("Could not load the PEPA compiler class from pepa.zip");
throw new InternalError("Could not load the PEPA compiler class from pepa.jar");
} catch (SecurityException se) {
Comment on lines 60 to 62
throw new InternalError("Could not secure the PEPA compiler class");
} catch (IllegalAccessException iae) {
Expand Down
Loading