[popfile-commit] engine Makefile, 1.41.4.5, 1.41.4.6 vars.mak, 1.11.4.5, 1.11.4.6

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20331

Modified Files:
      Tag: b0_22_2
	Makefile vars.mak 
Log Message:
Make it easier to change the copyright date for the Windows executables
(the popfile*.exe files) and mention the trademark in their VersionInfo
section. Ensure popfile.exe gets given the same version number as the
other Windows executables.

All of the NSIS-based programs already have the copyright date updated
automatically so no Makefile changes are required for them.

Index: vars.mak
===================================================================
RCS file: /cvsroot/popfile/engine/vars.mak,v
retrieving revision 1.11.4.5
retrieving revision 1.11.4.6
diff -C2 -d -r1.11.4.5 -r1.11.4.6
*** vars.mak	27 Nov 2007 07:54:36 -0000	1.11.4.5
--- vars.mak	5 Mar 2008 18:44:42 -0000	1.11.4.6
***************
*** 4,12 ****
  # and for testing
  #
! # Copyright (c) 2003-2006 John Graham-Cumming
  
  export POPFILE_MAJOR_VERSION=1
  export POPFILE_MINOR_VERSION=0
! export POPFILE_REVISION=0
  export POPFILE_VERSION:=$(POPFILE_MAJOR_VERSION).$(POPFILE_MINOR_VERSION).$(POPFILE_REVISION)
  POPFILE_VERSION_FILE=POPFile/popfile_version
--- 4,14 ----
  # and for testing
  #
! # Copyright (c) 2003-2008 John Graham-Cumming
! 
! export POPFILE_BUILD_YEAR=2008
  
  export POPFILE_MAJOR_VERSION=1
  export POPFILE_MINOR_VERSION=0
! export POPFILE_REVISION=1
  export POPFILE_VERSION:=$(POPFILE_MAJOR_VERSION).$(POPFILE_MINOR_VERSION).$(POPFILE_REVISION)
  POPFILE_VERSION_FILE=POPFile/popfile_version

Index: Makefile
===================================================================
RCS file: /cvsroot/popfile/engine/Makefile,v
retrieving revision 1.41.4.5
retrieving revision 1.41.4.6
diff -C2 -d -r1.41.4.5 -r1.41.4.6
*** Makefile	14 Dec 2007 09:05:45 -0000	1.41.4.5
--- Makefile	5 Mar 2008 18:44:42 -0000	1.41.4.6
***************
*** 4,8 ****
  # and for testing
  #
! # Copyright (c) 2003-2006 John Graham-Cumming
  
  include vars.mak
--- 4,8 ----
  # and for testing
  #
! # Copyright (c) 2003-2008 John Graham-Cumming
  
  include vars.mak
***************
*** 71,75 ****
  winexe: popfile.exe popfileb.exe popfilef.exe popfileib.exe popfileif.exe trayicon.ico ../windows/POPFileIcon/popfile.ico popfile-service.exe
  
! COMMON_EXE_OPTIONS = --exe $@ --force --clean --dependent --xclude --icon ../windows/POPFileIcon/popfile.ico --icon trayicon.ico --script $< --info CompanyName="The POPFile Project" --info LegalCopyright="Copyright (c) 2006 John Graham-Cumming" --info ProductName=POPFile --info ProductVersion=$(POPFILE_VERSION).0 --info FileDescription=POPFile --info FileVersion=$(POPFILE_VERSION).0
  ifeq ($(EXE_DEBUG),1)
  COMMON_EXE_OPTIONS += --debug
--- 71,75 ----
  winexe: popfile.exe popfileb.exe popfilef.exe popfileib.exe popfileif.exe trayicon.ico ../windows/POPFileIcon/popfile.ico popfile-service.exe
  
! COMMON_EXE_OPTIONS = --exe $@ --force --clean --dependent --xclude --icon ../windows/POPFileIcon/popfile.ico --icon trayicon.ico --script $< --info CompanyName="The POPFile Project" --info LegalCopyright="Copyright (c) $(POPFILE_BUILD_YEAR) John Graham-Cumming" --info LegalTrademarks="POPFile is a registered trademark of John Graham-Cumming" --info ProductName=POPFile --info ProductVersion=$(POPFILE_VERSION).0 --info FileDescription=POPFile --info FileVersion=$(POPFILE_VERSION).0
  ifeq ($(EXE_DEBUG),1)
  COMMON_EXE_OPTIONS += --debug
***************
*** 78,82 ****
  TRAY_OPTIONS = $(COMMON_EXE_OPTIONS)
  
! popfile.exe: popfile-windows.pl
  	perlapp --gui $(TRAY_OPTIONS)
  
--- 78,82 ----
  TRAY_OPTIONS = $(COMMON_EXE_OPTIONS)
  
! popfile.exe: popfile-windows.pl $(POPFILE_VERSION_FILE)
  	perlapp --gui $(TRAY_OPTIONS)