popfile-commit

[<jgr...@us...>]

Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv28087/engine

Modified Files:
	vars.mak Makefile popfile.pl popfile-tray.pl 
Log Message:
Create a single place where the POPFile version number is stored. 
POPFile now reads its version number from a file called popfile_version
which is stored in the POPFile subdirectory.  This file is created
by the build process from information in vars.mak.

engine/vars.mak:

Add variables to hold the major, minor and revision numbers of the 
POPFile version and a variable that holds the name of the file that
will contains the POPFile version information.

engine/popfile.pl
engine/popfile-tray.pl:

Remove explicit set of the POPFile version number, this is now handled
by POPFile::Loader::CORE_loader_init.

engine/POPFile/Loader.pm:

CORE_loader_init looks for the file popfile_version in the same directory
and if found reads and sets the version number from it.

windows/installer.nsi:

Installer script reads the variables set in vars.mak to set the version
number being built.


Index: vars.mak
===================================================================
RCS file: /cvsroot/popfile/engine/vars.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** vars.mak	27 Oct 2003 22:05:10 -0000	1.4
--- vars.mak	5 Nov 2003 15:08:23 -0000	1.5
***************
*** 6,10 ****
  # Copyright (c) 2003 John Graham-Cumming
  
! export POPFILE_VERSION=0.20.1
  POPFILE_ZIP := popfile-$(POPFILE_VERSION)$(RC).zip
  POPFILE_WINDOWS_ZIP := popfile-$(POPFILE_VERSION)$(RC)-windows.zip
--- 6,14 ----
  # Copyright (c) 2003 John Graham-Cumming
  
! export POPFILE_MAJOR_VERSION=0
! export POPFILE_MINOR_VERSION=20
! export POPFILE_REVISION=1
! export POPFILE_VERSION:=$(POPFILE_MAJOR_VERSION).$(POPFILE_MINOR_VERSION).$(POPFILE_REVISION)
! POPFILE_VERSION_FILE=POPFile/popfile_version
  POPFILE_ZIP := popfile-$(POPFILE_VERSION)$(RC).zip
  POPFILE_WINDOWS_ZIP := popfile-$(POPFILE_VERSION)$(RC)-windows.zip

Index: Makefile
===================================================================
RCS file: /cvsroot/popfile/engine/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Makefile	27 Oct 2003 22:04:05 -0000	1.28
--- Makefile	5 Nov 2003 15:08:23 -0000	1.29
***************
*** 1,105 ****
! # POPFile Makefile
! #
! # This Makefile is used for the creation of POPFile packages
! # and for testing
! #
! # Copyright (c) 2003 John Graham-Cumming
! 
! include vars.mak
! 
! .PHONY: test package windows core manual skins coverage macosx
! 
! error:
! 	@echo Must specify one of coverage, test, package or windows
! 	@echo 
! 	@echo "coverage - Run POPFile test suite with coverage information"
! 	@echo "test     - Run POPFile test suite"
! 	@echo "           (test and coverage pass the TESTARGS variable to the test suite)"
! 	@echo
! 	@echo "windows  - Build Windows executables and installer" 
! 	@echo "macosx   - Build Mac OS X package installer"
! 	@echo "xplat    - Build the cross-platform ZIP"
! 	@echo "package  - Build Windows installer, and create"
! 	@echo "           ZIP files for Windows and cross-platform"
! 	@echo "           version"
! 	@echo "rc       - After doing package moves the ZIP files to be RC zip files"
! 	@echo "           The RC number is set with the RC parameter so do" 
! 	@echo "           make rc RC=RC6 for example."
! 
! # test runs the POPFile unit test suite
! 
! coverage:
! 	@echo Running test suite with code coverage
! ifdef TESTARGS
! 	@echo with arguments '$(TESTARGS)'
! endif
! 	@$(MAKE) --no-print-directory -C tests runtest TESTARGS=$(TESTARGS) DEBUGARGS=-d:TestCoverage
! 
! test:     
! 	@echo Running test suite
! ifdef TESTARGS
! 	@echo with arguments '$(TESTARGS)'
! endif
! 	@$(MAKE) --no-print-directory -C tests runtest TESTARGS=$(TESTARGS) DEBUGARGS=
! 
! # Mac OS X is built in the Mac OS X directory
! 
! macosx: ; @$(MAKE) -C ../macosx
! 
! # Builds the tray application using PerlTray
! 
! winexe: popfile.exe popfileb.exe popfilef.exe popfileib.exe popfileif.exe trayicon.ico ../windows/POPFileIcon/popfile.ico
! 
! TRAY_OPTIONS = --exe $@ --force --clean --dependent --xclude --icon ../windows/POPFileIcon/popfile.ico --icon trayicon.ico --script $< --info CompanyName="The POPFile Project" --info LegalCopyright="Copyright (c) 2003 John Graham-Cumming" --info ProductName=POPFile --info ProductVersion=$(POPFILE_VERSION).0 --info FileDescription=POPFile --info FileVersion=$(POPFILE_VERSION).0 
! ifeq ($(TRAY_DEBUG),1)
! TRAY_OPTIONS += --debug
! endif
! 
! popfile.exe: popfile-windows.pl
! 	perlapp --gui $(TRAY_OPTIONS)
! 
! popfileif.exe: popfile-tray.pl POPFile/Loader.pm
! 	perltray --nogui $(TRAY_OPTIONS)
! 
! popfileib.exe: popfile-tray.pl POPFile/Loader.pm
! 	perltray $(TRAY_OPTIONS)
! 
! popfilef.exe: popfile.pl POPFile/Loader.pm
! 	perlapp $(TRAY_OPTIONS)
! 
! popfileb.exe: popfile.pl POPFile/Loader.pm
! 	perlapp --gui $(TRAY_OPTIONS)
! 
! # windows builds the Windows installer
! 
! windows: winexe; @$(MAKE) -C ../windows
! 
! # build a ZIPped up package of POPFile
! 
! BUILD_ZIP=wzzip -P $(POPFILE_ZIP) -a $^
! xplat: $(POPFILE_ZIP)
! $(POPFILE_ZIP): core manual skins
! 
! core: popfile.pl otto.gif pix.gif black.gif bayes.pl pipe.pl insert.pl Classifier/*.pm POPFile/*.pm Proxy/POP3.pm Proxy/Proxy.pm UI/HT??.pm v$(POPFILE_VERSION).change license stopwords favicon.ico
! 	rm -f $(POPFILE_ZIP)
! 	$(BUILD_ZIP)
! 
! manual: manual/*.gif manual/en/*.html languages/*.msg
! 	$(BUILD_ZIP)
! 
! skins: skins/*.css skins/*.gif  skins/*/*.gif
! 	$(BUILD_ZIP)
! 
! # package builds a zip file containing the POPFile package and the windows
! # installer
! 
! package: $(POPFILE_ZIP) windows
! 
! # Used to convert the ZIP files to RC ZIP files and 
! # upload to SourceForge
! 
! rc: RELEASE_FILES := $(POPFILE_ZIP) ../windows/$(POPFILE_WINDOWS_ZIP) 
! rc: 
! 	chmod go+r $(RELEASE_FILES)
! 	scp -p $(RELEASE_FILES) jgr...@po...:/home/groups/p/po/popfile/htdocs
! 
--- 1,112 ----
! # POPFile Makefile
! #
! # This Makefile is used for the creation of POPFile packages
! # and for testing
! #
! # Copyright (c) 2003 John Graham-Cumming
! 
! include vars.mak
! 
! .PHONY: test package windows core manual skins coverage macosx
! 
! error:
! 	@echo Must specify one of coverage, test, package or windows
! 	@echo 
! 	@echo "coverage - Run POPFile test suite with coverage information"
! 	@echo "test     - Run POPFile test suite"
! 	@echo "           (test and coverage pass the TESTARGS variable to the test suite)"
! 	@echo
! 	@echo "windows  - Build Windows executables and installer" 
! 	@echo "macosx   - Build Mac OS X package installer"
! 	@echo "xplat    - Build the cross-platform ZIP"
! 	@echo "package  - Build Windows installer, and create"
! 	@echo "           ZIP files for Windows and cross-platform"
! 	@echo "           version"
! 	@echo "rc       - After doing package moves the ZIP files to be RC zip files"
! 	@echo "           The RC number is set with the RC parameter so do" 
! 	@echo "           make rc RC=RC6 for example."
! 
! # test runs the POPFile unit test suite
! 
! coverage:
! 	@echo Running test suite with code coverage
! ifdef TESTARGS
! 	@echo with arguments '$(TESTARGS)'
! endif
! 	@$(MAKE) --no-print-directory -C tests runtest TESTARGS=$(TESTARGS) DEBUGARGS=-d:TestCoverage
! 
! test:     
! 	@echo Running test suite
! ifdef TESTARGS
! 	@echo with arguments '$(TESTARGS)'
! endif
! 	@$(MAKE) --no-print-directory -C tests runtest TESTARGS=$(TESTARGS) DEBUGARGS=
! 
! # Mac OS X is built in the Mac OS X directory
! 
! macosx: ; @$(MAKE) -C ../macosx
! 
! # Builds the tray application using PerlTray
! 
! winexe: popfile.exe popfileb.exe popfilef.exe popfileib.exe popfileif.exe trayicon.ico ../windows/POPFileIcon/popfile.ico
! 
! TRAY_OPTIONS = --exe $@ --force --clean --dependent --xclude --icon ../windows/POPFileIcon/popfile.ico --icon trayicon.ico --script $< --info CompanyName="The POPFile Project" --info LegalCopyright="Copyright (c) 2003 John Graham-Cumming" --info ProductName=POPFile --info ProductVersion=$(POPFILE_VERSION).0 --info FileDescription=POPFile --info FileVersion=$(POPFILE_VERSION).0 
! ifeq ($(TRAY_DEBUG),1)
! TRAY_OPTIONS += --debug
! endif
! 
! popfile.exe: popfile-windows.pl
! 	perlapp --gui $(TRAY_OPTIONS)
! 
! popfileif.exe: popfile-tray.pl POPFile/Loader.pm $(POPFILE_VERSION_FILE)
! 	perltray --nogui $(TRAY_OPTIONS)
! 
! popfileib.exe: popfile-tray.pl POPFile/Loader.pm $(POPFILE_VERSION_FILE)
! 	perltray $(TRAY_OPTIONS)
! 
! popfilef.exe: popfile.pl POPFile/Loader.pm $(POPFILE_VERSION_FILE)
! 	perlapp $(TRAY_OPTIONS)
! 
! popfileb.exe: popfile.pl POPFile/Loader.pm $(POPFILE_VERSION_FILE)
! 	perlapp --gui $(TRAY_OPTIONS)
! 
! # windows builds the Windows installer
! 
! windows: winexe; @$(MAKE) -C ../windows
! 
! # build a ZIPped up package of POPFile
! 
! BUILD_ZIP=wzzip -P $(POPFILE_ZIP) -a $^
! xplat: $(POPFILE_ZIP)
! $(POPFILE_ZIP): core manual skins POPFile/popfile_version
! 
! core: popfile.pl otto.gif pix.gif black.gif bayes.pl pipe.pl insert.pl Classifier/*.pm POPFile/*.pm Proxy/POP3.pm Proxy/Proxy.pm UI/HT??.pm v$(POPFILE_VERSION).change license stopwords favicon.ico $(POPFILE_VERSION_FILE)
! 	rm -f $(POPFILE_ZIP)
! 	$(BUILD_ZIP)
! 
! manual: manual/*.gif manual/en/*.html languages/*.msg
! 	$(BUILD_ZIP)
! 
! skins: skins/*.css skins/*.gif  skins/*/*.gif
! 	$(BUILD_ZIP)
! 
! # package builds a zip file containing the POPFile package and the windows
! # installer
! 
! package: $(POPFILE_ZIP) windows
! 
! # Used to convert the ZIP files to RC ZIP files and 
! # upload to SourceForge
! 
! rc: RELEASE_FILES := $(POPFILE_ZIP) ../windows/$(POPFILE_WINDOWS_ZIP) 
! rc: 
! 	chmod go+r $(RELEASE_FILES)
! 	scp -p $(RELEASE_FILES) jgr...@po...:/home/groups/p/po/popfile/htdocs
! 
! # The POPFile version number is stored in a file called POPFile/popfile_version 
! # which we always write if vars.mak has changed
! 
! $(POPFILE_VERSION_FILE): vars.mak
! 	@echo $(POPFILE_MAJOR_VERSION) > $@
! 	@echo $(POPFILE_MINOR_VERSION) >> $@
! 	@echo $(POPFILE_REVISION) >> $@

Index: popfile.pl
===================================================================
RCS file: /cvsroot/popfile/engine/popfile.pl,v
retrieving revision 1.215
retrieving revision 1.216
diff -C2 -d -r1.215 -r1.216
*** popfile.pl	4 Nov 2003 21:17:08 -0000	1.215
--- popfile.pl	5 Nov 2003 15:08:23 -0000	1.216
***************
*** 43,47 ****
  $POPFile->debug(1);
  $POPFile->CORE_loader_init();
- $POPFile->CORE_version(0, 20, 1);
  
  # Redefine POPFile's signals
--- 43,46 ----

Index: popfile-tray.pl
===================================================================
RCS file: /cvsroot/popfile/engine/popfile-tray.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** popfile-tray.pl	28 Oct 2003 01:05:39 -0000	1.2
--- popfile-tray.pl	5 Nov 2003 15:08:23 -0000	1.3
***************
*** 109,113 ****
  $POPFile->debug(1);
  $POPFile->CORE_loader_init();
- $POPFile->CORE_version(0, 20, 0);
  
  # Redefine POPFile's signals
--- 109,112 ----