[Fusionforge-commits] r8902 - in trunk: . gforge/docs/phpdoc

Olaf Lenz olenz at libremir.placard.fr.eu.org
Tue Mar 2 11:48:03 CET 2010


Author: olenz
Date: 2010-03-02 11:48:02 +0100 (Tue, 02 Mar 2010)
New Revision: 8902

Added:
   trunk/gforge/docs/phpdoc/phpDocumentor.ini.patch
Removed:
   trunk/gforge/docs/phpdoc/manageclass.patch
Modified:
   trunk/Makefile
   trunk/Makefile.debian
   trunk/gforge/docs/phpdoc/makedoc.sh
Log:
Merge branch 'phpdocumentor-1.4.3'

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-03-01 21:46:44 UTC (rev 8901)
+++ trunk/Makefile	2010-03-02 10:48:02 UTC (rev 8902)
@@ -28,7 +28,7 @@
 	@echo "Use one of the following target with "
 	@echo "make -f Makefile.$(DIST) <target>"
 	@echo "=========================================================================="
-	@make -f Makefile.$(DIST)
+	@$(MAKE) -f Makefile.$(DIST)
 
 check:
 	cd tests ; php AllTests.php
@@ -61,7 +61,7 @@
 
 
 gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php:
-	cd gforge/plugins/mediawiki/mediawiki-skin ; make
+	$(MAKE) -C gforge/plugins/mediawiki/mediawiki-skin
 
 %: gforge/plugins/mediawiki/mediawiki-skin/FusionForge.php
-	@make -f Makefile.$(DIST) $@
+	$(MAKE) -f Makefile.$(DIST) $@

Modified: trunk/Makefile.debian
===================================================================
--- trunk/Makefile.debian	2010-03-01 21:46:44 UTC (rev 8901)
+++ trunk/Makefile.debian	2010-03-02 10:48:02 UTC (rev 8902)
@@ -87,64 +87,73 @@
 #
 #:======== Debian Builds ============#
 lenny:    # Simply build lenny packages #
-	make cowbuilddeb DEBIANLIST=1lenny
+	$(MAKE) cowbuilddeb DEBIANLIST=1lenny
 
 rlenny:   # Make a lenny repository #
-	make repodeb DEBIANLIST=1lenny
+	$(MAKE) repodeb DEBIANLIST=1lenny
 
 squeeze:  # Simply build squeeze packages #
-	make cowbuilddeb DEBIANLIST=2squeeze
+	$(MAKE) cowbuilddeb DEBIANLIST=2squeeze
 
 rsqueeze: # Make a squeeze repository #
-	make repodeb DEBIANLIST=2squeeze
+	$(MAKE) repodeb DEBIANLIST=2squeeze
 
 sid:      # Simply build sid packages #
-	make cowbuilddeb DEBIANLIST=3sid
+	$(MAKE) cowbuilddeb DEBIANLIST=3sid
 
 rsid:     # Make a sid repository #
-	make repodeb DEBIANLIST=3sid
+	$(MAKE) repodeb DEBIANLIST=3sid
 
 #:======== Ubuntu Builds ============#
 intrepid:  # Simply build intrepid packages #
-	make cowbuildubu UBUNTULIST=1intrepid
+	$(MAKE) cowbuildubu UBUNTULIST=1intrepid
 
 rintrepid: # Make an intrepid repository #
-	make repoubu UBUNTULIST=1intrepid
+	$(MAKE) repoubu UBUNTULIST=1intrepid
 
 jaunty:    # Simply build jaunty packages #
-	make cowbuildubu UBUNTULIST=1jaunty
+	$(MAKE) cowbuildubu UBUNTULIST=1jaunty
 
 rjaunty:   # Make a jaunty repository #
-	make repoubu UBUNTULIST=1jaunty
+	$(MAKE) repoubu UBUNTULIST=1jaunty
 
 karmic:    # Simply build karmic packages #
-	make cowbuildubu UBUNTULIST=1karmic
+	$(MAKE) cowbuildubu UBUNTULIST=1karmic
 
 rkarmic:   # Make a karmic repository #
-	make repoubu UBUNTULIST=1karmic
+	$(MAKE) repoubu UBUNTULIST=1karmic
 
 #:======== Other and Multiple Builds ============#
 documentor_path=/tmp
-documentor_vers=phpdocumentor-1.3.0rc3
+documentor_url=http://downloads.sourceforge.net/project/phpdocu/PhpDoc/phpDocumentor-1.4.3/PhpDocumentor-1.4.3.tgz
+documentor_file=PhpDocumentor-1.4.3.tgz
+documentor_subdir=PhpDocumentor-1.4.3
 
 #
 # FUSIONFORGE
 #
 
-orig: $(TARBALLS)/$(ORIGFILE) # Make FUSIONFORGE orig file                                      #
+orig: $(TARBALLS)/$(ORIGFILE) # Make FUSIONFORGE orig file
 
 #
 # PHPDOCUMENTOR
 #
-phpdoc: phpdocumentor_get phpdocumentor_unpack $(documentor_path)/$(documentor_vers)/patched $(PKGDIR)/docs/phpdoc/docs # Get phpdocumentor, install phpdocumentor, build $(PKGNAME) phpdoc     #
+# Get phpdocumentor, install phpdocumentor, build $(PKGNAME) phpdoc
+phpdoc: $(PKGDIR)/docs/phpdoc/docs 
 
 phpdocumentor_get:
-	[ ! -f $(documentor_path)/$(documentor_vers).tar.gz ] && cd $(documentor_path) && wget http://heanet.dl.sourceforge.net/sourceforge/phpdocu/$(documentor_vers).tar.gz || true
-phpdocumentor_unpack:
-	[ ! -d $(documentor_path)/$(documentor_vers) ] && cd $(documentor_path) && tar xvzf $(documentor_vers).tar.gz || true
-$(documentor_path)/$(documentor_vers)/patched:
-	cd $(documentor_path)/ && patch -p2 < $(CURDIR)/$(PKGDIR)/docs/phpdoc/manageclass.patch && touch $(documentor_path)/$(documentor_vers)/patched 
-$(PKGDIR)/docs/phpdoc/docs:
+	[ ! -f $(documentor_path)/$(documentor_file) ] && \
+        cd $(documentor_path) && \
+        wget $(documentor_url) || true
+phpdocumentor_unpack: phpdocumentor_get
+	[ ! -d $(documentor_path)/$(documentor_subdir) ] && \
+        cd $(documentor_path) && \
+        tar -xvzf $(documentor_file) || true
+$(documentor_path)/$(documentor_subdir)/patched: phpdocumentor_unpack
+	cd $(documentor_path)/$(documentor_subdir) && \
+        patch < $(CURDIR)/$(PKGDIR)/docs/phpdoc/phpDocumentor.ini.patch \
+        && touch $(documentor_path)/$(documentor_subdir)/patched 
+$(PKGDIR)/docs/phpdoc/docs: $(documentor_path)/$(documentor_subdir)/patched
 	cd $(PKGDIR)/docs/phpdoc/ && ./makedoc.sh
 
 #
@@ -157,12 +166,12 @@
 
 repodeb: cowbuilddeb
 	@for dist in $(DEBIANLIST); do \
-	make -f Makefile.debian localrepo reprepro XDISTRIB=$$dist LOCALREPO=$(LOCALREPODEB) DISTRIBLIST="$(DEBLIST)" ; \
+	$(MAKE) -f Makefile.debian localrepo reprepro XDISTRIB=$$dist LOCALREPO=$(LOCALREPODEB) DISTRIBLIST="$(DEBLIST)" ; \
 	done
 
 repoubu: cowbuildubu
 	@for dist in $(UBUNTULIST); do \
-	make -f Makefile.debian localrepo reprepro XDISTRIB=$$dist LOCALREPO=$(LOCALREPOUBU) DISTRIBLIST="$(UBULIST)" ; \
+	$(MAKE) -f Makefile.debian localrepo reprepro XDISTRIB=$$dist LOCALREPO=$(LOCALREPOUBU) DISTRIBLIST="$(UBULIST)" ; \
 	done
 
 cowbuildtest:
@@ -170,22 +179,22 @@
 
 cowbuilddeb: # ***** This is the one to cowbuild debian packages ***** #
 	@for dist in $(DEBIANLIST); do \
-	make -f Makefile.debian cowbuilddist XDISTRIB=$$dist DISTROOP="$(DEBIANOP)" ; \
+	$(MAKE) -f Makefile.debian cowbuilddist XDISTRIB=$$dist DISTROOP="$(DEBIANOP)" ; \
 	done
 
 cowbuildubu: # ***** This is the one to cowbuild ubuntu packages ***** #
 	@for dist in $(UBUNTULIST); do \
-	make -f Makefile.debian cowbuilddist XDISTRIB=$$dist DISTROOP="$(UBUNTUOP)" HOOK='$(UBUHOOK)' ; \
+	$(MAKE) -f Makefile.debian cowbuilddist XDISTRIB=$$dist DISTROOP="$(UBUNTUOP)" HOOK='$(UBUHOOK)' ; \
 	done
 
 pbuilddeb: # pbuild debian packages (less recommended) #
 	@for dist in $(DEBIANLISTP); do \
-	make -f Makefile.debian pbuilddist XDISTRIB=$$dist DISTROOP="$(DEBIANOP)" LOCALREPO=$(LOCALREPODEB) ; \
+	$(MAKE) -f Makefile.debian pbuilddist XDISTRIB=$$dist DISTROOP="$(DEBIANOP)" LOCALREPO=$(LOCALREPODEB) ; \
 	done
 
 pbuildubu: # pbuild ubuntu packages (less recommended) #
 	@for dist in $(UBUNTULISTP); do \
-	make -f Makefile.debian pbuilddist XDISTRIB=$$dist DISTROOP="$(UBUNTUOP)" LOCALREPO=$(LOCALREPOUBU) ; \
+	$(MAKE) -f Makefile.debian pbuilddist XDISTRIB=$$dist DISTROOP="$(UBUNTUOP)" LOCALREPO=$(LOCALREPOUBU) ; \
 	done
 
 cowbuilddist: cowbuilderenv $(BUILDFILES) $(BUILDRESULT)/$(CHANGEFILE)

Modified: trunk/gforge/docs/phpdoc/makedoc.sh
===================================================================
--- trunk/gforge/docs/phpdoc/makedoc.sh	2010-03-01 21:46:44 UTC (rev 8901)
+++ trunk/gforge/docs/phpdoc/makedoc.sh	2010-03-02 10:48:02 UTC (rev 8902)
@@ -26,14 +26,14 @@
 #  * 
 #  * @var               string TITLE
 #  */
-TITLE="GForge PHP Documentation"
+TITLE="FusionForge PHP Documentation"
 
 #/** 
 #  * name to use for the default package. If not specified, uses 'default'
 #  *
 #  * @var               string PACKAGES
 #  */
-PACKAGES="GForge"
+PACKAGES="FusionForge"
 
 #/** 
 #  * name of a directory(s) to parse directory1,directory2
@@ -48,7 +48,7 @@
 #  *
 #  * @var               string PATH_PHPDOC
 #  */
-PATH_PHPDOC=/tmp/phpdocumentor-1.3.0rc3/phpdoc
+PATH_PHPDOC=/tmp/PhpDocumentor-1.4.3/phpdoc
 
 #/**
 #  * where documentation will be put

Deleted: trunk/gforge/docs/phpdoc/manageclass.patch
===================================================================
--- trunk/gforge/docs/phpdoc/manageclass.patch	2010-03-01 21:46:44 UTC (rev 8901)
+++ trunk/gforge/docs/phpdoc/manageclass.patch	2010-03-02 10:48:02 UTC (rev 8902)
@@ -1,11 +0,0 @@
-diff -ruN /tmp/phpdocumentor-1.3.0rc3/phpDocumentor.ini /home/bayle/tmp/phpdocumentor-1.3.0rc3/phpDocumentor.ini
---- /tmp/phpdocumentor-1.3.0rc3/phpDocumentor.ini	2004-01-11 04:25:39.000000000 +0100
-+++ /home/bayle/tmp/phpdocumentor-1.3.0rc3/phpDocumentor.ini	2005-01-04 22:24:30.000000000 +0100
-@@ -26,6 +26,7 @@
- php5
- phtml
- inc
-+class
- 
- ;; deprecated in 1.2
- ;; this list is informational only - the following tags will be parsed as

Added: trunk/gforge/docs/phpdoc/phpDocumentor.ini.patch
===================================================================
--- trunk/gforge/docs/phpdoc/phpDocumentor.ini.patch	                        (rev 0)
+++ trunk/gforge/docs/phpdoc/phpDocumentor.ini.patch	2010-03-02 10:48:02 UTC (rev 8902)
@@ -0,0 +1,19 @@
+--- phpDocumentor.ini.orig	2010-02-25 11:48:58.918048044 +0100
++++ phpDocumentor.ini	2010-02-25 11:49:19.668076615 +0100
+@@ -22,7 +22,7 @@
+ 
+ ;; set max memory usage size to be very high, to avoid it crashing it the middle of its run
+ ;; due to using a boatload of memory
+-;;memory_limit = 512M
++memory_limit = 1536M
+ 
+ [_phpDocumentor_phpfile_exts]
+ php
+@@ -30,6 +30,7 @@
+ php4
+ phtml
+ inc
++class
+ 
+ ;; deprecated in 1.2
+ ;; this list is informational only - the following tags will be parsed as




More information about the Fusionforge-commits mailing list