s14h
/
prism-accumulation
1
0
Fork 0
Code Releases Activity
Browse Source

Merge .ostype.txt and .java_dir.txt files into Makefile. 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 20 years ago
parent
9fae627e51
commit
f477451cf5
3 changed files with 54 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      prism/.java_dir.txt
  2. 13
      prism/.ostype.txt
  3. 68
      prism/Makefile

28
prism/.java_dir.txt
View File

@ -1,28 +0,0 @@
PRISM was unable to find the directory which contains
your Java distribution. Please specify this manually to
make as in the following example:
make JAVA_DIR=/usr/java/j2sdk1.4.2
If you don't know where your Java distribution is, try typing:
which javac
If the output is of the form 'javac: Command not found' or
'which: no javaccc in...' then either you don't have Java
installed or your path is not set up to include Java.
If the output is something like:
/bham/java/packages/j2sdk1.4.2/bin/javac
then the directory is /usr/java/j2sdk1.4.2
(i.e. with the '/bin/javac' removed).
One situation where this doesn't work is when javac
has been set up as a symbolic link. In this case, type:
ls -l `which javac`
which will tell you where javac actually is (the part displayed
after the -> arrow. You can then deduce what the directory is as above.

13
prism/.ostype.txt
View File

@ -1,13 +0,0 @@
To compile PRISM, the environment variable OSTYPE
must be set to one of: linux, solaris, cygwin,
depending on which operating system you are using.
This is not the case on your system. Please specify
the value of OSTYPE manually to make, e.g.:
make OSTYPE=linux
Alternatively, if you wish, you can set the environment
variable yourself (using setenv or export) or you
can edit the value of OSTYPE directly in the Makefile.

68
prism/Makefile
View File

@ -204,20 +204,6 @@ cuddpackage:
/bin/cp Makefile.$(OSTYPE) Makefile && \ /bin/cp Makefile.$(OSTYPE) Makefile && \
$(MAKE) $(MAKE)
checks:
@(if [ "$(OSTYPE)" != "linux" -a "$(OSTYPE)" != "solaris" -a "$(OSTYPE)" != "cygwin" -a "$(OSTYPE)" != "darwin" ]; then \
cat .ostype.txt; \
exit 1; \
fi; \
if [ "$(JAVA_DIR)" = "" ]; then \
cat .java_dir.txt; \
exit 1; \
fi; \
if [ ! -f $(JAVA_JNI_H_DIR)/jni.h ]; then \
echo "Failed to locate JNI headers jni.h and jni_md.h. Are you sure Java is installed?"; \
exit 1; \
fi)
prism: checks sortplugins make_dirs post_make prism: checks sortplugins make_dirs post_make
sortplugins: sortplugins:
@ -377,5 +363,59 @@ clean_apmc: checks
clean_simulator: checks clean_simulator: checks
@(cd src/simulator && $(MAKE) -s SRC_DIR="$(SRC_DIR)" CLASSES_DIR="$(CLASSES_DIR)" OBJ_DIR="$(OBJ_DIR)" LIB_DIR="$(LIB_DIR)" EXE="$(EXE)" LIBPREFIX="$(LIBPREFIX)" LIBSUFFIX="$(LIBSUFFIX)" clean) @(cd src/simulator && $(MAKE) -s SRC_DIR="$(SRC_DIR)" CLASSES_DIR="$(CLASSES_DIR)" OBJ_DIR="$(OBJ_DIR)" LIB_DIR="$(LIB_DIR)" EXE="$(EXE)" LIBPREFIX="$(LIBPREFIX)" LIBSUFFIX="$(LIBSUFFIX)" clean)
checks:
@(if [ "$(OSTYPE)" != "linux" -a "$(OSTYPE)" != "solaris" -a "$(OSTYPE)" != "cygwin" -a "$(OSTYPE)" != "darwin" ]; then \
echo "To compile PRISM, the environment variable OSTYPE"; \
echo "must be set to one of: linux, solaris, cygwin or darwin,"; \
echo "depending on which operating system you are using."; \
echo "This is not the case on your system. Please specify"; \
echo "the value of OSTYPE manually to make, e.g.:"; \
echo; \
echo " make OSTYPE=linux"; \
echo; \
echo "Alternatively, if you wish, you can set the environment"; \
echo "variable yourself (using setenv or export) or you"; \
echo "can edit the value of OSTYPE directly in the Makefile."; \
exit 1; \
fi; \
if [ "$(JAVA_DIR)" = "" ]; then \
echo "PRISM was unable to find the directory which contains"; \
echo "your Java distribution. Please specify this manually to"; \
echo "make as in the following example:"; \
echo; \
echo " make JAVA_DIR=/usr/java/j2sdk1.4.2"; \
echo; \
echo "If you do not know where your Java distribution is, try typing:"; \
echo; \
echo " which javac"; \
echo; \
echo "If the output is of the form 'javac: Command not found' or"; \
echo "'which: no javaccc in...' then either you do not have Java"; \
echo "installed or your path is not set up to include Java."; \
echo "If the output is something like:"; \
echo; \
echo " /bham/java/packages/j2sdk1.4.2/bin/javac"; \
echo; \
echo "then the directory is /usr/java/j2sdk1.4.2"; \
echo "(i.e. with the '/bin/javac' removed)."; \
echo "One situation where this doesn't work is when javac"; \
echo "has been set up as a symbolic link. In this case, type:"; \
echo; \
echo " ls -l `which javac`"; \
echo; \
echo "which will tell you where javac actually is (the part displayed"; \
echo "after the -> arrow. You can then deduce what the directory is as above."; \
exit 1; \
fi; \
if [ ! -f $(JAVA_JNI_H_DIR)/jni.h ]; then \
echo "Failed to locate the JNI header $(JAVA_JNI_H_DIR)/jni.h."; \
echo "Are you sure Java is installed?"; \
exit 1; \
fi; \
if [ ! -f $(JAVA_JNI_MD_H_DIR)/jni_md.h ]; then \
echo "Failed to locate the JNI header $(JAVA_JNI_MD_H_DIR)/jni_md.h"; \
echo "Are you sure Java is installed?"; \
exit 1; \
fi)
################################################# #################################################
Write Preview
Loading…
Cancel
Save