[e-cvs] cvs commit: e/src/jsrc Makefile
markm@eros.cs.jhu.edu
markm@eros.cs.jhu.edu
Sun, 23 Dec 2001 00:54:54 -0500
markm 01/12/23 00:54:54
Modified: src Makefile
src/csrc/byaccj Makefile
src/jsrc Makefile
Log:
Preparing for the 0.8.10 release
Revision Changes Path
1.133 +24 -9 e/src/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/e/src/Makefile,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- Makefile 2001/12/22 05:46:08 1.132
+++ Makefile 2001/12/23 05:54:54 1.133
@@ -7,8 +7,8 @@
# Prefix tagging this release's attributes
PREFIX=E
-DOTVER=0.8.10epsilon2
-TAGVER=0_8_10epsilon2
+DOTVER=0.8.10
+TAGVER=0_8_10
RELEASE=working
TOP=..
@@ -25,18 +25,34 @@
setup:
-rm -rf $(TOP)/dist
- mkdir -p $(TOP)/dist
- echo $(DOTVER) > $(TOP)/dist/eVersion.txt
+ mkdir $(TOP)/dist
cp -rf $(TOP)/src/bin $(TOP)/dist/bin
+ mkdir $(TOP)/dist/bin/$(PLATDIR)
+ @echo ""
+ @echo "------------------"
+ifeq "$(MAKE_PARSERS)" "true"
+ @echo "Attempting to make byaccj in order to remake the parsers."
+ @echo "If the following C compiles don't work, then unset"
+ @echo "MAKE_PARSERS, or set it to 'false', and start again."
+ @echo "This should be fine so long as you don't need to change"
+ @echo "any *.y files."
+ (cd csrc/byaccj; $(MAKE) all install)
+else
+ @echo "Not making byaccj or remaking the parsers."
+ @echo "If you want to make these, set the environment variable"
+ @echo "'MAKE_PARSERS' to 'true' and start again."
+endif
+ @echo "------------------"
+ @echo ""
+ echo $(DOTVER) > $(TOP)/dist/eVersion.txt
cp -rf $(TOP)/src/esrc/scripts $(TOP)/dist/scripts
cp -rf $(TOP)/src/elisp/* $(TOP)/dist/scripts
-rm -rf `find $(TOP)/dist -name CVS`
- mkdir $(TOP)/dist/bin/$(PLATDIR)
- (cd csrc/byaccj; $(MAKE) all install)
export:
-rm -rf $(TOP)/export
- mkdir --parents $(TOP)/export/e
+ mkdir $(TOP)/export
+ mkdir $(TOP)/export/e
cp -rf $(TOP)/dist $(TOP)/export/dist
cp -rf $(TOP)/src $(TOP)/export/e/src
-rm -rf $(TOP)/export/e/src/ePrograms
@@ -70,7 +86,7 @@
tarballs:
-rm -rf $(TOP)/tarballs
- mkdir -p $(TOP)/tarballs
+ mkdir $(TOP)/tarballs
# e newlines.e --msdos $(TOP)/export
(cd $(TOP)/export; zip -rqD $(UPFIX1)-src-$(DOTVER).zip e)
ifdef CYGWINOS
@@ -80,7 +96,6 @@
(cd $(TOP)/export/dist; tar czf $(UPFIX2)-nix-$(DOTVER).tar.gz .)
(cd $(TOP)/export; tar czf $(UPFIX1)-src-$(DOTVER).tar.gz e)
cp -f $(TOP)/export/dist/e.jar $(TOP)/tarballs
-# -rm -rf $(TOP)/export
ckversion:
ifeq "$(RELEASE)" "release"
1.3 +1 -1 e/src/csrc/byaccj/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/e/src/csrc/byaccj/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 2001/03/15 11:45:05 1.2
+++ Makefile 2001/12/23 05:54:54 1.3
@@ -53,4 +53,4 @@
cp byaccj$(EXE) $(TOP)/dist/bin/win32
else
cp byaccj$(EXE) $(TOP)/dist/bin/linux-386-glibc
-endif
\ No newline at end of file
+endif
1.68 +10 -2 e/src/jsrc/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/e/src/jsrc/Makefile,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Makefile 2001/12/18 21:59:30 1.67
+++ Makefile 2001/12/23 05:54:54 1.68
@@ -10,12 +10,19 @@
include $(TOP)/src/build/makerules.mk
+ifeq "$(MAKE_PARSERS)" "true"
+all: all_parse
+else
+all: all_noparse
+endif
+
+
ER=org/erights/e
setup:
-rm -rf $(TOP)/classes/*
- mkdir -p $(TOP)/classes/
+ mkdir $(TOP)/classes
cp -rf $(TOP)/src/esrc/* $(TOP)/classes/
cp -rf $(TOP)/src/safej/* $(TOP)/classes/
cp -rf $(TOP)/src/bin/resources/* $(TOP)/classes/
@@ -114,8 +121,9 @@
twixt_parsers: stl_elib quasi_1 third_party quasi_2
post_parsers: stl_elang _elmer _extern _vattp _captp _ertp
+
-all: pre_parsers term_parser twixt_parsers elang_parser post_parsers
+all_parse: pre_parsers term_parser twixt_parsers elang_parser post_parsers
all_noparse: pre_parsers twixt_parsers post_parsers