X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=a5d9260fa16ee6e1b83d9a64e863de4ba767000d;hp=2ee8bb8499464c931d3623d151ddd8dfb48a9825;hb=dce3af8d6974a6c5b05955703de2e983f112b765;hpb=d6c55258bdfa1d46c471773c7f6095a6d1b7c46c
diff --git a/Makefile b/Makefile
index 2ee8bb8..a5d9260 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
java = java -Xmx900m
+default: edu.berkeley.sbp.jar
+
tibdoc: edu.berkeley.sbp.jar
$(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
tests/tibdoc.g \
@@ -19,72 +21,53 @@ demo: edu.berkeley.sbp.jar
demo2: edu.berkeley.sbp.jar
$(java) -cp $< edu.berkeley.sbp.misc.Demo2
+ast: edu.berkeley.sbp.jar
+ $(java) -cp $< edu.berkeley.sbp.misc.TestAstGenerator tests/math.g
+
regress:
make boot
rm edu.berkeley.sbp.jar
make test
-profile: edu.berkeley.sbp.jar
- $(java) -agentlib:yjpagent \
- -cp $< edu.berkeley.sbp.misc.RegressionTests \
- -profile \
- tests/meta.g \
- tests/testcase.g \
- tests/regression.tc
-
+VERSION = ${shell cat VERSION}
+releases_dir = /afs/research.cs.berkeley.edu/project/sbp/releases/
+git_repo = /afs/research.cs.berkeley.edu/project/sbp/edu.berkeley.sbp.git/
+release: edu.berkeley.sbp.jar
+ echo == making release ${VERSION} ==============================
+ echo
+ git push ${git_repo}
+ git archive --prefix=sbp-${VERSION} HEAD | gzip > \
+ ${releases_dir}/sbp-${VERSION}.tgz
+ cp edu.berkeley.sbp.jar ${releases_dir}/sbp-${VERSION}.jar
+ emacs -nw ~/wix/src/research.cs.berkeley.edu/sbp/index.wix
+ cd ~/proj/wix; make
+
+#-Dsbp.verbose=true
test: edu.berkeley.sbp.jar
$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
- tests/meta.g \
+ src/edu/berkeley/sbp/meta/meta.g \
tests/testcase.g \
tests/regression.tc
-archscript: edu.berkeley.sbp.jar
- cd tests; \
- $(java) -cp ArchSimA3.jar:../$< ArchScript \
- test.archscript
-
-codebag: edu.berkeley.sbp.jar
- cd tests; \
- $(java) -cp ArchSimA3.jar:../$< CodeBagParser \
- test.fleet
-
-javatest: edu.berkeley.sbp.jar
- $(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
- tests/meta.g \
- tests/testcase.g \
- tests/java.tc
-
-loop: edu.berkeley.sbp.jar
- $(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
- -graph \
- tests/meta.g \
- tests/testcase.g \
- tests/loop.tc
-
-pain: edu.berkeley.sbp.jar
- $(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
- -graph \
- tests/meta.g \
- tests/testcase.g \
- tests/pain.tc
-
-ifthen: edu.berkeley.sbp.jar
- $(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
- tests/meta.g \
+profile: edu.berkeley.sbp.jar
+ $(java) -agentpath:/Applications/YourKit.app/bin/mac/libyjpagent.jnilib -cp $< edu.berkeley.sbp.misc.RegressionTests \
+ -profile \
+ src/edu/berkeley/sbp/meta/meta.g \
tests/testcase.g \
- tests/ifthen.tc
+ tests/regression.tc
boot: edu.berkeley.sbp.jar
cd src; \
$(java) -cp ../$< \
edu.berkeley.sbp.meta.MetaGrammar \
- ../tests/meta.g \
+ ../src/edu/berkeley/sbp/meta/meta.g \
edu.berkeley.sbp.meta.MetaGrammar
edu.berkeley.sbp.jar: $(shell find src -name \*.java)
mkdir -p bin
javac -cp javax.servlet.jar -d bin -sourcepath src $^
- cd bin; jar cf ../$@ .
+ echo 'Main-Class: edu.berkeley.sbp.misc.CommandLine' > bin/manifest
+ cd bin; jar cmf manifest ../$@ .
#-Xlint:unchecked
javadoc:
rm -rf doc/api
@@ -114,113 +97,11 @@ javadoc:
-noqualifier all \
-d doc/api \
edu.berkeley.sbp.meta \
- edu.berkeley.sbp.bind \
edu.berkeley.sbp.chr \
edu.berkeley.sbp.misc \
- edu.berkeley.sbp.tib \
edu.berkeley.sbp.util
clean:
rm -rf doc/api edu.berkeley.sbp.jar bin edu.berkeley.sbp.tar.gz
rm -rf Makefile.bak *.hi *.o *.class *.jar Header_*.hs Class_*.hs *_JVM.hs InterfaceMyClass
-upload:
- make clean
- make javadoc
- darcs dist
- echo '' > index.html
- rsync -are ssh --progress --verbose --delete ./ argus.cs.berkeley.edu:public_html/sbp/
-
-
-
-###################################################################
-## Experimental Haskell bindings
-##
-## make runHaskellDemo JAVA_HOME=
-##
-
-ghc_version = $(shell ghc --version | sed 's_.*version \([0-9]*\.[0-9]*\).*_\1_')
-
-ifeq ($(ghc_version),6.5)
-patchghc = patch -p0 < $(shell pwd)/misc/ghc-6.5-patch &&
-else
-patchghc =
-endif
-
-ifeq ($(shell uname),Darwin)
-with_jvmdir = --with-jvmdir=/System/Library/Frameworks/JavaVM.framework/
-jvmlink = -framework JavaVM -optl -fexceptions
-patchmac = patch -p0 < $(shell pwd)/misc/intel-mac-patch &&
-linkopts =
-else
-with_jvmdir = --with-jvmdir=$(JAVA_HOME)
-jvmlink = -ljava -ljvm -lverify
-patchmac =
-linkopts = -optl "-Wl,-rpath,$(JAVA_HOME)/jre/lib/i386/" -optl "-Wl,-rpath,$(JAVA_HOME)/jre/lib/i386/client/"
-endif
-
-prefix = $(shell pwd)/prefix
-jvm-bridge-site = umn.dl.sourceforge.net
-jvm-bridge-url = http://$(jvm-bridge-site)/sourceforge/jvm-bridge/haskell-jvm-bridge-0.3.tar.gz
-
-# The double -lHaskellJVMBridge is due to a circular link dep; the linux linker gets upset
-link = -L$(prefix)/lib/ \
- -L$(JAVA_HOME)/jre/lib/i386/ \
- -L$(JAVA_HOME)/jre/lib/i386/client/ \
- -lstdc++ -lHaskellJVMBridge -lJVMBridge -lJVMInvocation -lHaskellJVMBridge $(jvmlink)
-packages = -package haskell98 -package base -package rts
-ghc = ghc -fglasgow-exts $(packages) -i$(prefix)/imports/
-bin = $(prefix)/bin/
-
-.jvm-bridge:
- mkdir -p $(prefix)/src
-
- cd $(prefix)/src; \
- curl $(jvm-bridge-url) | tar -xvzf -
-
- cd $(prefix)/src/haskell-jvm-bridge-*; \
- patch -p0 < $(shell pwd)/misc/broken-cygwin-detection-patch && \
- $(patchmac) \
- $(patchghc) \
- (cd Native; autoreconf; true) && \
- (cd Haskell; autoreconf; true)
-
- cd $(prefix)/src/haskell-jvm-bridge-*/Native; \
- ./configure --prefix=$(prefix) $(with_jvmdir) && \
- make && \
- make install
-
- cd $(prefix)/src/haskell-jvm-bridge-*/Haskell; \
- ./configure --prefix=$(prefix) $(with_jvmdir) && \
- make && \
- make install
-
- touch $@
-
-runHaskellDemo: .jvm-bridge
- mkdir -p bin
- make bin/HaskellDemo
- bin/HaskellDemo
-
-bin/Header_%.o: edu.berkeley.sbp.jar .jvm-bridge
- cd bin; $(bin)/MakeHeaderModule -module Header_$* -jar ../edu.berkeley.sbp.jar
- cd bin; $(ghc) -c Header_$*.hs $(link)
-
-bin/Class_%.o: bin/Header_%.o
- cd bin; $(bin)/MakeClassModule -import Header_Java -import Header_$* -cp ../edu.berkeley.sbp.jar `echo $* | sed s/_/./g`
- cd bin; $(ghc) -c Class_$*.hs $(link)
-
-bin/JVM_%.o: bin/Class_%.o
- cd bin; echo -e $($*_list) | $(bin)/MakeJVMModule JVM_$*
- cd bin; $(ghc) -c JVM_$*.hs $(link)
-
-edu_berkeley_sbp_misc_HaskellHelper_list = "edu.berkeley.sbp.misc.HaskellHelper\njava.lang.String\nedu.berkeley.sbp.Tree\njava.lang.Object"
-
-bin/HaskellDemo: src/HaskellDemo.hs \
- bin/Class_java_lang_Object.o \
- bin/Class_java_lang_String.o \
- bin/Class_edu_berkeley_sbp_Tree.o \
- bin/JVM_edu_berkeley_sbp_misc_HaskellHelper.o
- cd bin; $(ghc) -c ../src/HaskellDemo.hs $(link) -o HaskellDemo.o
- cd bin; for A in *.hs; do $(ghc) -c $$A $(link); done
- cd bin; $(ghc) $(linkopts) $(link) -o HaskellDemo *.o