[Phpgroupware-cvs] CVS: packages Makefile,NONE,1.1 conf,1.3,1.4 do,1.4,1.5

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

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

Modified Files:
        conf do 
Added Files:
        Makefile 
Log Message:
- Splitted `do' into `do' (still self executable Makefile) and a Makefile.
  Now `do' read the `Makefile' setting up some default values.
- Modified `do', `Makefile' and `conf' to use variables to include other files.


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
Index: conf
===================================================================
RCS file: /cvsroot/phpgroupware/packages/conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** conf        25 Jun 2002 16:07:11 -0000      1.3
--- conf        28 Jun 2002 19:36:56 -0000      1.4
***************
*** 1,3 ****
! #!/usr/bin/make -f
  #
  # 
-----------------------------------------------------------------------------
--- 1,3 ----
! #!make
  #
  # 
-----------------------------------------------------------------------------

Index: do
===================================================================
RCS file: /cvsroot/phpgroupware/packages/do,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** do  25 Jun 2002 17:43:01 -0000      1.4
--- do  28 Jun 2002 19:36:56 -0000      1.5
***************
*** 23,390 ****
  #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
! CONF = packages/conf
  
! include $(CONF)
  
! # 
-----------------------------------------------------------------------------
! # _NON_ editable options: do _NOT_ edit, unless you are _ABSOLUTELY_ sure.
! # 
-----------------------------------------------------------------------------
! CVS = -path \*CVS\* -or -name .cvs\*
! EXCLUDED_MODULES += debian
! EXCLUDED_MODULES += transy
! EXCLUDED_MODULES += packages
! EXCLUDED_MODULES += felamimail
! EXCLUDED_MODULES += squirrelmail
! EXCLUDED_MODULES += syncml-server
! EXCLUDED_MODULES += old
! EXCLUDED_MODULES_PATHS = -path \. -or $(CVS)
! EXCLUDED_MODULES_PATHS += $(patsubst %,-or -path \*%\*,$(EXCLUDED_MODULES))
! MODULES_PATHS = -type d -maxdepth 1 -not \( $(EXCLUDED_MODULES_PATHS) \)
! MODULES := $(shell find $(MODULES_PATHS) -printf "%f ") 
! 
! EXCLUDED_SOURCE_FILES = -name \*.sgml -or $(CVS)
! SOURCE_FILES = -type f -not \( $(EXCLUDED_SOURCE_FILES) \)
! 
! VERSION := $(shell $(SEDN) 's/\$Name: \([^ ]\+\)/\1/p' < packages/version)
! ifndef VERSION
! VERSION := $(shell date +"%Y%m%d")
! CHANGELOG_VERSION = '/^Version/ s/^[^ ]\+ \([^ ]\+\)/\1/p'
! UPSTREAM_VERSION = 's/^\([^-]\+\)-.*$$/\1/p'
! else
! UPSTREAM_VERSION := 's/_/./g ; s/^[^-]\+-\(.*\)$$/\1/p'
! endif
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # Documents backends and extensions.
! # 
-----------------------------------------------------------------------------
! # - txt:              Plain text file format.
! # - onehtml:  HTML file format (single file output).
! # - rtf:              RTF file format.
! # - ps:                       PostScript file format.
! #
! # We could actually use more kinds of formats, but i don't see the need.
! 
! BACKENDS := txt onehtml rtf
! 
! # Mapipng backends in extensions is simple:
! # txt         => .txt
! # onehtml     => .html
! # rtf         => .rtf
! # ps          => .ps
! 
! txt     = txt
! onehtml = html
! rtf     = rtf
! 
! # jadetex is not required by sgmltools, so, if present, add the ps backend and
! # extension.
! ifneq ($(shell which jadetex),)
! BACKENDS += ps
! ps = ps
! endif
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # Packages rules.
! # 
-----------------------------------------------------------------------------
! 
! build: $(FORMATS)
! 
! $(FORMATS): % : $(foreach module,$(MODULES),$(module).%.builded)
! 
! ALL_BUILDED = $(foreach format,$(FORMATS),%.$(format).builded)
! 
! $(MODULES): % : %.all.builded
! 
! $(MODULES:%=%.all.builded): %.all.builded : requirements $(ALL_BUILDED)
! 
! # 
-----------------------------------------------------------------------------
! # Rules to check requirements
! # 
-----------------------------------------------------------------------------
! require = $(foreach command,$(subst -,_,$(1)), \
!       $(if $(shell which $(command)), \
!               touch $(@) ; \
!       , \
!               $(error Command not found: `$(1)') \
!       ) \
! )
! 
! requirements: $(FORMATS:%=%.requirements)
! 
! default.requirements:
!       $(call require,sgmltools dpkg-parsechangelog)
! 
! tar.gz.requirements: default.requirements
!       $(call require,tar gzip)
! 
! tar.bz2.requirements: default.requirements
!       $(call require,tar bzip2)
! 
! orig.tar.gz.requirements: tar.gz.requirements
!       $(call require,find install)
! 
! deb.requirements: orig.tar.gz.requirements
!       $(call require,fakeroot dch)
! 
! $(foreach format,rpm tgz slp,$(format).requirements): deb.requirements
!       $(call require,alien)
! 
! pkg.requirements: deb.requirements
!       $(call require,pkginfo pkgtrans)
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # Specific variable and targets to compile source files (SGML documents)
! # 
-----------------------------------------------------------------------------
! 
! compile: $(MODULES:%=%.source.files.compiled)
! 
! $(MODULES:%=%.source.files.compiled): \
!       %.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):
!       find $(@:.source.files=) $(SOURCE_FILES) -fprint $(@)
! 
! $(MODULES:%=%.source.version):
!       $(if $(CHANGELOG_VERSION), \
!               cd $(@:.source.version=) && \
!                       $(DPKG_PARSECHANGELOG) | $(SEDN) $(CHANGELOG_VERSION) > 
../$(@) \
!       , \
!               echo $(VERSION) > $(@) \
!       )
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # Specific variables and targets to build .tar.gz archives.
! # 
-----------------------------------------------------------------------------
! TAR_GZ_ARCHIVES = %-$(VERSION).tar.gz
! TAR_GZ_REQUIRED = tar.gz.requirements %.source.files
! 
! $(MODULES:%=%.tar.gz.builded): %.tar.gz.builded : $(TAR_GZ_ARCHIVES)
!       echo $(@:%.tar.gz.builded=$(TAR_GZ_ARCHIVES)) > $(@)
! 
! $(MODULES:%=$(TAR_GZ_ARCHIVES)): $(TAR_GZ_ARCHIVES) : $(TAR_GZ_REQUIRED)
!       $(TAR) --files-from $(@:$(TAR_GZ_ARCHIVES)=%.source.files) | \
!               $(GZIP) > $(@)
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # Specific variables and targets to build .tar.bz2 archives.
! # 
-----------------------------------------------------------------------------
! TAR_BZ2_ARCHIVES = %-$(VERSION).tar.bz2
! TAR_BZ2_REQUIRED = tar.bz2.requirements %.source.files
! 
! $(MODULES:%=%.tar.bz2.builded): %.tar.bz2.builded : $(TAR_BZ2_ARCHIVES)
!       echo $(@:%.tar.bz2.builded=$(TAR_BZ2_ARCHIVES)) > $(@)
! 
! $(MODULES:%=$(TAR_BZ2_ARCHIVES)): $(TAR_BZ2_ARCHIVES) : $(TAR_BZ2_REQUIRED)
!       $(TAR) --files-from $(@:$(TAR_BZ2_ARCHIVES)=%.source.files) | \
!               $(BZIP2) > $(@)
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # Specific variables and targets to build .orig.tar.gz archives.
! # 
-----------------------------------------------------------------------------
! ORIG_BUILDED = .orig.tar.gz.builded
! ORIG_REQUIRED = orig.tar.gz.requirements %.source.clean %.source.version
! ORIG_MODULE = $(@:$(ORIG_BUILDED)=)
! ORIG_VERSION = \
!       $(shell $(SEDN) $(UPSTREAM_VERSION) < 
$(@:$(ORIG_BUILDED)=.source.version))
! ORIG_PACKAGE_NAME = $(subst _,-,$(ORIG_MODULE))
! ORIG_SUORCE_DIRECTORY = $(ORIG_PACKAGE_NAME)-$(ORIG_VERSION).orig
! ORIG_BUILD_DIRECTORY = $(BUILD_DIRECTORY)/$(ORIG_SUORCE_DIRECTORY)
! ORIG_TAR_GZ = $(ORIG_PACKAGE_NAME)_$(ORIG_VERSION).orig.tar.gz
! 
! $(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)
!       echo $(ORIG_TAR_GZ) > $(@)
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # Specific variables and targets to build .deb packages.
! # 
-----------------------------------------------------------------------------
! DEB_PACKAGE_NAME = phpgroupware-$(subst _,-,$(@:.deb.builded=))
! ifdef CHANGELOG_VERSION
! DEB_VERSION = $(shell cat $(@:.deb.builded=.source.version))
! DEB_UPSTREAM_VERSION = $(shell echo $(DEB_VERSION) | $(SEDN) 
$(UPSTREAM_VERSION))
! DEB_NEW_VERSION = $(DEB_VERSION).$(VERSION)
! else
! DEB_VERSION = \
!       $(shell $(SEDN) $(UPSTREAM_VERSION) < $(@:.deb.builded=.source.version))
! DEB_NEW_VERSION = $(DEB_VERSION)-0
! endif
! DEB_SOURCE_DIRECTORY = $(DEB_PACKAGE_NAME)-$(DEB_UPSTREAM_VERSION)
! DEB_BUILD_DIRECTORY = $(BUILD_DIRECTORY)/$(DEB_SOURCE_DIRECTORY)
! DEB_LIST = "s/^[^']\+' in \`\.\.\/\([^']\+\).*/\1/p"
! DEB_BUILDED = $(DEB_BUILD_DIRECTORY)/debian/.builded
! 
! DEB_FILES = -type f -not \( $(CVS) \)
! 
! DEB_REQUIRED = deb.requirements %.source.clean %.source.version
! 
! $(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)
! 
! # 
-----------------------------------------------------------------------------
! # Specific variables and targets to build .rpm packages.
! # 
-----------------------------------------------------------------------------
! $(MODULES:%=%.rpm.builded): %.rpm.builded : rpm.requirements %.deb.builded
!       $(call compiled,$(@:.rpm.builded=),rpm) > $(@)
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # Specific variables and targets to build .tgz packages.
! # 
-----------------------------------------------------------------------------
! $(MODULES:%=%.tgz.builded): %.tgz.builded : tgz.requirements %.deb.builded
!       $(call compiled,$(@:.tgz.builded=),tgz) > $(@)
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # Specific variables and targets to build .slp packages.
! # 
-----------------------------------------------------------------------------
! $(MODULES:%=%.slp.builded): %.slp.builded : slp.requirements %.deb.builded
!       $(call compiled,$(@:.slp.builded=),slp) > $(@)
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # Specific variables and targets to build .pkg packages.
! # 
-----------------------------------------------------------------------------
! $(MODULES:%=%.pkg.builded): %.pkg.builded : pkg.requirements %.deb.builded
!       $(call compiled,pkg) > $(@)
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # Specific variables and targets to build core package.
! # 
-----------------------------------------------------------------------------
! CORE_MODULES  = addressbook
! CORE_MODULES += admin
! CORE_MODULES += calendar
! CORE_MODULES += email
! CORE_MODULES += manual
! CORE_MODULES += nntp
! CORE_MODULES += notes
! CORE_MODULES += phpgwapi
! CORE_MODULES += preferences
! CORE_MODULES += setup
! CORE_MODULES += todo
! 
! CORE_BUILD_DIRECTORY = $(BUILD_DIRECTORY)/core
! CORE_ARCHIVES = phpgroupware-core-$(VERSION).tar.%
! CORE_PACKAGES := $(patsubst %,$(CORE_ARCHIVES),gz bz2)
! CORE_SOURCES = phpgroupware $(CORE_MODULES)
! CORE_SOURCES_COMPILED = $(patsubst %,%.source.files.compiled,$(CORE_SOURCES))
! 
! gz = $(GZIP)
! bz2 = $(BZIP2)
! 
! core: core.packages.builded
! 
! core.packages.builded: $(CORE_PACKAGES)
!       echo $(^) > $(@)
! 
! $(CORE_PACKAGES): tar.gz.requirements tar.bz2.requirements core.source.files
!       $(TAR) -C $(CORE_BUILD_DIRECTORY) phpgroupware | \
!               $($(@:core-$(VERSION).tar.=)) >> $(@)
! 
! 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 $(@)
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # The release target.
! # 
-----------------------------------------------------------------------------
! release: build core
!       for format in $(FORMATS) ; do \
!               cat *.$${format}.builded | while read file ; do \
!                       $(INSTALL) $${file} $(RELEASE_DIRECTORY)/$${format} \
!               done ;\
!       done
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # The install target.
! # 
-----------------------------------------------------------------------------
! install: $(MODULES:%=%.files.compiled)
!       find phpgroupware $(SOURCE_FILES) -exec \
!               $(INSTALL) {} $(INSTALL_DIRECTORY)/{} \;
!       find $(filter-out phpgroupware,$(MODULES)) $(SOURCE_FILES) -exec \
!               $(INSTALL) {} $(INSTALL_DIRECTORY)/phpgroupware/{} \;
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # The lint target.
! # 
-----------------------------------------------------------------------------
! 
! include $(wildcard packages/lint/checks/*.check)
! 
! lint: $(MODULES:%=%.lint.report)
! 
! LINT_INFOS = 's/{MODULE}/$(@:.lint.report=)/ ; s/{VERSION}/$(VERSION)/g'
! LINT_CHECKS = $(foreach check,$(CHECKS),%.lint.$(check))
! 
! $(MODULES:%=%.lint.report): %.lint.report : $(LINT_CHECKS)
!       for check in $(CHECKS) ; do \
!               if test -s $(@:report=)$${check} ; then \
!                       $(SED) $(LINT_INFOS) < \
!                               packages/lint/infos/$${check}.info >> $(@) ;\
!               fi ;\
!       done
!       touch $(@)
! # 
-----------------------------------------------------------------------------
! 
! # 
-----------------------------------------------------------------------------
! # The clean target.
! # 
-----------------------------------------------------------------------------
! $(MODULES:%=%.source.clean):
!       if test -f $(@:clean=files.compiled) ; then \
!               cat $(@:clean=files.compiled) | xargs $(RM) ;\
!       fi
!       touch $(@)
! 
! clean: $(MODULES:%=%.source.clean)
!       for list in $(wildcard *.builded) ; do \
!               cat $${list} | xargs $(RM) ;\
!       done
!       -$(RM) *.requirements
!       -$(RM) *.lint.*
!       -$(RM) *.builded
!       -$(RM) *.source.*
!       -$(RM) --recursive $(BUILD_DIRECTORY)
! # 
-----------------------------------------------------------------------------
! 
! .PHONY: build compile clean release install lint core $(MODULES) $(FORMATS)
--- 23,31 ----
  #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
! # The real Makefile name.
! Makefile = Makefile
  
! # The directory under which the Makefile resides.
! INCLUDES = packages
  
! include $(INCLUDES)/$(Makefile)