[Commits] (vajda) - added a bunch of missing .cvsignore files

commits at osafoundation.org commits at osafoundation.org
Thu Aug 19 16:56:12 PDT 2004


Commit by: vajda
Modified files:
external/Makefile 1.40 1.41
external/openssl/.cvsignore 1.1 1.2
external/swig/.cvsignore None 1.1
external/swig/Makefile 1.11 1.12
external/twisted/.cvsignore None 1.1
external/yapps/.cvsignore None 1.1
external/yapps/__init__.py None 1.1
external/yapps/patches-2.1.1 None 1.1
external/yapps/Makefile 1.2 1.3
external/zope/.cvsignore None 1.1

Log message:
 - added a bunch of missing .cvsignore files
 - fixed bugs along the way doing a full build on OS X
 - patched yapps so that it doesn't get installed in site-packages toplevel


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/Makefile.diff?r1=text&tr1=1.40&r2=text&tr2=1.41
http://cvs.osafoundation.org/index.cgi/external/openssl/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/external/swig/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/swig/Makefile.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
http://cvs.osafoundation.org/index.cgi/external/twisted/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/yapps/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/yapps/__init__.py?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/yapps/patches-2.1.1?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/yapps/Makefile.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/external/zope/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup

Index: external/swig/Makefile
diff -u external/swig/Makefile:1.11 external/swig/Makefile:1.12
--- external/swig/Makefile:1.11	Wed Aug 18 15:25:09 2004
+++ external/swig/Makefile	Thu Aug 19 16:56:08 2004
@@ -50,7 +50,7 @@
 
 EXECUTABLE=
 
-$(SRC)/$(BUILD)/Makefile: expand apply
+$(SRC)/$(BUILD)/Makefile: apply
 	cd $(SRC); \
 	mkdir -p $(BUILD); \
 	cd $(BUILD); \

Index: external/openssl/.cvsignore
diff -u external/openssl/.cvsignore:1.1 external/openssl/.cvsignore:1.2
--- external/openssl/.cvsignore:1.1	Fri Apr 23 18:36:36 2004
+++ external/openssl/.cvsignore	Thu Aug 19 16:56:08 2004
@@ -1 +1,2 @@
 *.gz
+openssl-*

Index: external/Makefile
diff -u external/Makefile:1.40 external/Makefile:1.41
--- external/Makefile:1.40	Fri Aug 13 12:23:51 2004
+++ external/Makefile	Thu Aug 19 16:56:07 2004
@@ -26,7 +26,7 @@
         python/Python-2.3.3.tgz \
         python/bzip2-1.0.2.tar.gz \
         python/zlib-1.2.1.tar.gz \
-        swig/swig-20Feb04.tar.gz \
+        swig/SWIG-20Feb04.tar.gz \
         epydoc/epydoc-2.1.tar.gz \
         PyLucene/PyLucene-0.5.1.tar.gz \
         persistence/xerces-c/xerces-c-src2_4_0.tar.gz \
@@ -88,11 +88,11 @@
 	done
 
 realclean:
-	rm -rf $(SNAP)
+	rm -rf release debug
 	@for system in $(SYSTEMS); \
 	do \
 	    echo making _realclean in $$system; \
-	    $(MAKE) -C $$system -k DEBUG=$(DEBUG) _realclean; \
+	    $(MAKE) -C $$system -k _realclean; \
 	done
 
 upload:	$(SNAP)-$(VERSION).tar.gz

Index: external/yapps/Makefile
diff -u external/yapps/Makefile:1.2 external/yapps/Makefile:1.3
--- external/yapps/Makefile:1.2	Fri Aug 13 15:51:13 2004
+++ external/yapps/Makefile	Thu Aug 19 16:56:09 2004
@@ -7,21 +7,26 @@
 
 BUILD=build_$(SNAP)
 
-build: 
-	cd $(SRC); \
-	cp yapps2.py yappsrt.py grammar.py parsetree.py $(BUILD_ROOT)/$(SNAP)/$(SITE)/
+build: apply
+	mkdir -p $(PREFIX)/$(SITE)/yapps; \
+	cp -p $(SRC)/yapps2.py $(SRC)/yappsrt.py $(SRC)/grammar.py $(SRC)/parsetree.py $(PREFIX)/$(SITE)/yapps
+	cp -p __init__.py $(PREFIX)/$(SITE)/yapps
 
 expand: 
 	unzip -o yapps$(VERSION).zip
 
 snap: 
 	cd $(BUILD_ROOT); \
-	tar -cvzf $(YAPPS)/$(SNAP).tar.gz \
-			  $(SNAP)/$(SITE)/yapps2.py \
-			  $(SNAP)/$(SITE)/yappsrt.py \
-			  $(SNAP)/$(SITE)/grammar.py \
-			  $(SNAP)/$(SITE)/parsetree.py
+	tar -cvzf $(YAPPS)/$(SNAP).tar.gz $(SNAP)/$(SITE)/yapps
+
+apply: 
+	patch -Nup0 < patches-$(VERSION); echo ok
 
 clean:
 	rm -rf  $(SRC)/$(BUILD)
 
+patches:
+	diff -u yapps3-patched/grammar.py yapps3/grammar.py > patches-$(VERSION); true
+	diff -u yapps3-patched/yapps2.py yapps3/yapps2.py >> patches-$(VERSION); true
+	diff -u yapps3-patched/parsetree.py yapps3/parsetree.py >> patches-$(VERSION); true
+	diff -u yapps3-patched/yapps_grammar.py yapps3/yapps_grammar.py >> patches-$(VERSION); true



More information about the Commits mailing list