[Phpgroupware-cvs] CVS: packages Makefile,1.1,1.2

[Luca - De Whiskey's - De Vitis <address@hidden>]

Update of /cvsroot/phpgroupware/packages
In directory subversions:/tmp/cvs-serv6304/packages

Modified Files:
        Makefile 
Log Message:
- Added cron to EXCLUDED_MODULES
- Removed packages from EXCLUDED_MODULES (successfully build a deb package)
- Added the requirements check for each package format target.
- Modified the target for SGML files compilation:
  - Now it search for index.sgml files, compile them, and then move the
        resulting files to the right place; it guesses the real document name 
from
        the directory in which index.sgml is placed.
  - I Just want to be ready in case my proposal is accepted
        
(http://mail.gnu.org/pipermail/phpgroupware-docteam/2002-June/000167.html)
- Modified the target for deb packages building:
  - Now checks for the existence of the Description field in each
        module/debian/control file before building the packages.
- Use the new variable from the modified packages/conf file.


Index: Makefile
===================================================================
RCS file: /cvsroot/phpgroupware/packages/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile    28 Jun 2002 19:36:56 -0000      1.1
--- Makefile    30 Jun 2002 10:58:15 -0000      1.2
***************
*** 30,36 ****
  # 
-----------------------------------------------------------------------------
  CVS = -path \*CVS\* -or -name .cvs\*
  EXCLUDED_MODULES += debian
  EXCLUDED_MODULES += transy
- EXCLUDED_MODULES += packages
  EXCLUDED_MODULES += felamimail
  EXCLUDED_MODULES += squirrelmail
--- 30,36 ----
  # 
-----------------------------------------------------------------------------
  CVS = -path \*CVS\* -or -name .cvs\*
+ EXCLUDED_MODULES += cron
  EXCLUDED_MODULES += debian
  EXCLUDED_MODULES += transy
  EXCLUDED_MODULES += felamimail
  EXCLUDED_MODULES += squirrelmail
***************
*** 91,95 ****
  build: $(FORMATS)
  
! $(FORMATS): % : $(foreach module,$(MODULES),$(module).%.builded)
  
  ALL_BUILDED = $(foreach format,$(FORMATS),%.$(format).builded)
--- 91,95 ----
  build: $(FORMATS)
  
! $(FORMATS): % : $(foreach module,$(MODULES),$(module).%.builded) 
%.requirements
  
  ALL_BUILDED = $(foreach format,$(FORMATS),%.$(format).builded)
***************
*** 143,156 ****
        %.source.files.compiled : %.source.files.sgml %.source.files
        for sgml in $(shell cat $(@:compiled=sgml)) ; do \
                for backend in $(BACKENDS) ; do \
                        $(SGMLTOOLS) --backend=$${backend} $${sgml} ;\
                done ;\
-               file=$$(basename $${file} .sgml) ;\
-               echo $(foreach backend,$(BACKENDS),$${file}.$($(backend))) > 
$(@) ;\
        done
        touch $(@)
  
  $(MODULES:%=%.source.files.sgml):
!       find $(@:.source.files.sgml=)/doc -name \*.sgml -fprint $(@)
  
  $(MODULES:%=%.source.files):
--- 143,170 ----
        %.source.files.compiled : %.source.files.sgml %.source.files
        for sgml in $(shell cat $(@:compiled=sgml)) ; do \
+               dirname=$$(dirname $$sgml) ;\
+               doc=$$(basename $$dirname);\
                for backend in $(BACKENDS) ; do \
                        $(SGMLTOOLS) --backend=$${backend} $${sgml} ;\
+                       if [ -f $$dirnme/index.$$backend ] ; then \
+                               $(INSTALL_FILE) \
+                                       $$dirname/index.$$backend \
+                                       
$$dirname/../../$$backend/$$doc.$$backend ;\
+                               $(RM) $$dirname/index.$$backend ;\
+                               echo $$dirname/../../$$backend/$$doc.$$backend 
>> $(@) ;\
+                       elif [ -d $$dirname/index ] ; then \
+                               $(INSTALL_DIRECTORY) 
$$dirname/../../html/$$doc/ ;\
+                               for html in $$dirname/index/* ; do \
+                                       $(TIDY) < $$html > 
$$dirname/../../html/$$doc/$$(basename $$html) ;\
+                                       echo 
$$dirname/../../html/$$doc/$$(basename $$html) >> $(@) ;\
+                               done ;\
+                               $(RM) -r $$dirname/index/ ;\
+                       fi ;\
                done ;\
        done
        touch $(@)
  
  $(MODULES:%=%.source.files.sgml):
!       find $(@:.source.files.sgml=)/doc -name index.sgml -fprint $(@)
  
  $(MODULES:%=%.source.files):
***************
*** 209,213 ****
  $(MODULES:%=%$(ORIG_BUILDED)): %$(ORIG_BUILDED) : $(ORIG_REQUIRED)
        cd $(ORIG_MODULE) && find $(SOURCE_FILES) -exec \
!               $(INSTALL) {} ../$(ORIG_BUILD_DIRECTORY)/{} \; 
        $(TAR) -C $(BUILD_DIRECTORY) $(ORIG_SOURCE_DIRECTORY) | \
                $(GZIP) > $(ORIG_TAR_GZ)
--- 223,227 ----
  $(MODULES:%=%$(ORIG_BUILDED)): %$(ORIG_BUILDED) : $(ORIG_REQUIRED)
        cd $(ORIG_MODULE) && find $(SOURCE_FILES) -exec \
!               $(INSTALL_FILE) {} ../$(ORIG_BUILD_DIRECTORY)/{} \; 
        $(TAR) -C $(BUILD_DIRECTORY) $(ORIG_SOURCE_DIRECTORY) | \
                $(GZIP) > $(ORIG_TAR_GZ)
***************
*** 238,258 ****
  
  $(MODULES:%=%.deb.builded): %.deb.builded : $(DEB_REQUIRED)
!       cd $(@:.deb.builded=) && find $(DEB_FILES) \
!               -exec $(INSTALL) {} ../$(DEB_BUILD_DIRECTORY)/{} \;
!       cd $(DEB_BUILD_DIRECTORY) && \
!               $(DCH) $(DEB_NEW_VERSION) \
!                       "Automatically builded on $(shell date +"%Y.%m.%d")"
!       $(CHMOD) +x $(DEB_BUILD_DIRECTORY)/debian/rules
!       cd $(DEB_BUILD_DIRECTORY) && $(DEBIAN_RULES) binary 
!       $(RM) $(@)
!       for package in $$($(SEDN) $(DEB_LIST) < $(DEB_BUILDED)) ; do \
!               $(MV) $(BUILD_DIRECTORY)/$${package} . && \
!               echo $${package} >> $(@) ;\
!       done
  # 
-----------------------------------------------------------------------------
  
  COMPILED = 's/^\([^ ]\+\).*$$/\1/p'
  compiled = \
!       $(ALIEN) --to-$(2) $(shell cat $(1).deb.builded) | $(SEDN) $(COMPILED)
  
  # 
-----------------------------------------------------------------------------
--- 252,283 ----
  
  $(MODULES:%=%.deb.builded): %.deb.builded : $(DEB_REQUIRED)
!       if grep -q ^Description $(@:.deb.builded=)/debian/control ; then \
!               cd $(@:.deb.builded=) ;\
!                       find $(DEB_FILES)  -exec $(INSTALL_FILE) \
!                               {} ../$(DEB_BUILD_DIRECTORY)/{} \; ;\
!               cd - ;\
!               cd $(DEB_BUILD_DIRECTORY) ;\
!                       $(DCH) $(DEB_NEW_VERSION) \
!                               "Automatically builded on $(shell date 
+"%Y.%m.%d")" ;\
!               cd - ;\
!               $(CHMOD) +x $(DEB_BUILD_DIRECTORY)/debian/rules ;\
!               cd $(DEB_BUILD_DIRECTORY) ;\
!                       $(DEBIAN_RULES) binary ;\
!               cd - ;\
!               $(RM) $(@) ;\
!               for package in $$($(SEDN) $(DEB_LIST) < $(DEB_BUILDED)) ; do \
!                       $(MV) $(BUILD_DIRECTORY)/$${package} . && \
!                       echo $${package} >> $(@) ;\
!               done ;\
!       else \
!               touch $(@) ;\
!       fi
  # 
-----------------------------------------------------------------------------
  
  COMPILED = 's/^\([^ ]\+\).*$$/\1/p'
  compiled = \
!       if [ -s $(1).deb.builded ] ; then \
!               $(ALIEN) --to-$(2) $(shell cat $(1).deb.builded) | $(SEDN) 
$(COMPILED) ;\
!       fi
  
  # 
-----------------------------------------------------------------------------
***************
*** 319,325 ****
  core.source.files: # $(CORE_SOURCES_COMPILED)
        find phpgroupware $(SOURCE_FILES) \
!               -exec $(INSTALL) {} $(CORE_BUILD_DIRECTORY)/{} \;
        find $(CORE_MODULES) $(SOURCE_FILES) \
!               -exec $(INSTALL) {} $(CORE_BUILD_DIRECTORY)/phpgroupware/{} \;
        touch $(@)
  # 
-----------------------------------------------------------------------------
--- 344,350 ----
  core.source.files: # $(CORE_SOURCES_COMPILED)
        find phpgroupware $(SOURCE_FILES) \
!               -exec $(INSTALL_FILE) {} $(CORE_BUILD_DIRECTORY)/{} \;
        find $(CORE_MODULES) $(SOURCE_FILES) \
!               -exec $(INSTALL_FILE) {} 
$(CORE_BUILD_DIRECTORY)/phpgroupware/{} \;
        touch $(@)
  # 
-----------------------------------------------------------------------------
***************
*** 331,335 ****
        for format in $(FORMATS) ; do \
                cat *.$${format}.builded | while read file ; do \
!                       $(INSTALL) $${file} $(RELEASE_DIRECTORY)/$${format} \
                done ;\
        done
--- 356,360 ----
        for format in $(FORMATS) ; do \
                cat *.$${format}.builded | while read file ; do \
!                       $(INSTALL_FILE) $${file} 
$(RELEASE_DIRECTORY)/$${format} \
                done ;\
        done
***************
*** 341,347 ****
  install: $(MODULES:%=%.files.compiled)
        find phpgroupware $(SOURCE_FILES) -exec \
!               $(INSTALL) {} $(INSTALL_DIRECTORY)/{} \;
        find $(filter-out phpgroupware,$(MODULES)) $(SOURCE_FILES) -exec \
!               $(INSTALL) {} $(INSTALL_DIRECTORY)/phpgroupware/{} \;
  # 
-----------------------------------------------------------------------------
  
--- 366,372 ----
  install: $(MODULES:%=%.files.compiled)
        find phpgroupware $(SOURCE_FILES) -exec \
!               $(INSTALL_FILE) {} $(INSTALL_DIRECTORY)/{} \;
        find $(filter-out phpgroupware,$(MODULES)) $(SOURCE_FILES) -exec \
!               $(INSTALL_FILE) {} $(INSTALL_DIRECTORY)/phpgroupware/{} \;
  # 
-----------------------------------------------------------------------------