Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16988
Modified Files:
Tag: b0_22_2
adduser-Version.nsh adduser.nsi MonitorCC.nsi msgcapture.nsi
runpopfile.nsi runsqlite.nsi stop_popfile.nsi
Log Message:
Remove redundant code (it seems this was a misguided
attempt to fix a problem which did not really exist)
Index: stop_popfile.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v
retrieving revision 1.14.4.6
retrieving revision 1.14.4.7
diff -C2 -d -r1.14.4.6 -r1.14.4.7
*** stop_popfile.nsi 8 Feb 2007 19:26:22 -0000 1.14.4.6
--- stop_popfile.nsi 5 May 2007 12:28:07 -0000 1.14.4.7
***************
*** 123,127 ****
Caption "POPFile Silent Shutdown Utility"
! !define C_VERSION "0.6.4" ; see 'VIProductVersion' comment below for format details
!define C_OUTFILE "stop_pf.exe"
--- 123,127 ----
Caption "POPFile Silent Shutdown Utility"
! !define C_VERSION "0.6.5" ; see 'VIProductVersion' comment below for format details
!define C_OUTFILE "stop_pf.exe"
***************
*** 143,153 ****
RequestExecutionLevel user
- !tempfile EXE_HDR
- !packhdr "${EXE_HDR}" \
- '"toolkit\pfi-manifest.exe" \
- /FILE="${EXE_HDR}" \
- /NAME="POPFile.utility" \
- /DESCRIPTION="Silent shutdown utility for POPFile"'
-
;-------------------------------------------------------------------------------
; Time delay constants used in conjunction with the NSISdl plugin
--- 143,146 ----
Index: MonitorCC.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v
retrieving revision 1.19.4.6
retrieving revision 1.19.4.7
diff -C2 -d -r1.19.4.6 -r1.19.4.7
*** MonitorCC.nsi 8 Feb 2007 19:26:21 -0000 1.19.4.6
--- MonitorCC.nsi 5 May 2007 12:28:07 -0000 1.19.4.7
***************
*** 111,115 ****
Name "${C_PFI_PRODUCT}"
! !define C_PFI_VERSION "0.2.5"
!define C_OUTFILE "monitorcc.exe"
--- 111,115 ----
Name "${C_PFI_PRODUCT}"
! !define C_PFI_VERSION "0.2.6"
!define C_OUTFILE "monitorcc.exe"
***************
*** 125,135 ****
RequestExecutionLevel user
- !tempfile EXE_HDR
- !packhdr "${EXE_HDR}" \
- '"toolkit\pfi-manifest.exe" \
- /FILE="${EXE_HDR}" \
- /NAME="POPFile.utility" \
- /DESCRIPTION="Monitor flat-file or BerkeleyDB corpus conversion"'
-
;------------------------------------------------
; Define PFI_VERBOSE to get more compiler output
--- 125,128 ----
Index: runpopfile.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v
retrieving revision 1.11.4.7
retrieving revision 1.11.4.8
diff -C2 -d -r1.11.4.7 -r1.11.4.8
*** runpopfile.nsi 8 Feb 2007 19:26:21 -0000 1.11.4.7
--- runpopfile.nsi 5 May 2007 12:28:07 -0000 1.11.4.8
***************
*** 117,121 ****
;--------------------------------------------------------------------------
! !define C_PFI_VERSION "0.2.6"
!define C_OUTFILE "runpopfile.exe"
--- 117,121 ----
;--------------------------------------------------------------------------
! !define C_PFI_VERSION "0.2.7"
!define C_OUTFILE "runpopfile.exe"
***************
*** 142,152 ****
RequestExecutionLevel user
- !tempfile EXE_HDR
- !packhdr "${EXE_HDR}" \
- '"toolkit\pfi-manifest.exe" \
- /FILE="${EXE_HDR}" \
- /NAME="POPFile.utility" \
- /DESCRIPTION="Intelligent front-end used to launch POPFile"'
-
#--------------------------------------------------------------------------
# Use the standard NSIS list of common Windows Messages
--- 142,145 ----
Index: msgcapture.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v
retrieving revision 1.7.4.6
retrieving revision 1.7.4.7
diff -C2 -d -r1.7.4.6 -r1.7.4.7
*** msgcapture.nsi 8 Feb 2007 19:26:21 -0000 1.7.4.6
--- msgcapture.nsi 5 May 2007 12:28:07 -0000 1.7.4.7
***************
*** 115,119 ****
;--------------------------------------------------------------------------
! !define C_VERSION "0.1.5"
!define C_OUTFILE "msgcapture.exe"
--- 115,119 ----
;--------------------------------------------------------------------------
! !define C_VERSION "0.1.6"
!define C_OUTFILE "msgcapture.exe"
***************
*** 139,149 ****
RequestExecutionLevel user
- !tempfile EXE_HDR
- !packhdr "${EXE_HDR}" \
- '"toolkit\pfi-manifest.exe" \
- /FILE="${EXE_HDR}" \
- /NAME="POPFile.utility" \
- /DESCRIPTION="Capture console messages from POPFile"'
-
#--------------------------------------------------------------------------
# Use the "Modern User Interface"
--- 139,142 ----
Index: adduser-Version.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v
retrieving revision 1.6.2.12
retrieving revision 1.6.2.13
diff -C2 -d -r1.6.2.12 -r1.6.2.13
*** adduser-Version.nsh 8 Feb 2007 19:26:21 -0000 1.6.2.12
--- adduser-Version.nsh 5 May 2007 12:28:07 -0000 1.6.2.13
***************
*** 7,11 ****
#--------------------------------------------------------------------------
! !define C_PFI_VERSION "0.3.8"
#--------------------------------------------------------------------------
--- 7,11 ----
#--------------------------------------------------------------------------
! !define C_PFI_VERSION "0.3.9"
#--------------------------------------------------------------------------
Index: runsqlite.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -C2 -d -r1.1.4.6 -r1.1.4.7
*** runsqlite.nsi 8 Feb 2007 19:26:22 -0000 1.1.4.6
--- runsqlite.nsi 5 May 2007 12:28:07 -0000 1.1.4.7
***************
*** 75,79 ****
;--------------------------------------------------------------------------
! !define C_VERSION "0.1.4" ; see 'VIProductVersion' comment below for format details
!define C_OUTFILE "runsqlite.exe"
--- 75,79 ----
;--------------------------------------------------------------------------
! !define C_VERSION "0.1.5" ; see 'VIProductVersion' comment below for format details
!define C_OUTFILE "runsqlite.exe"
***************
*** 99,109 ****
RequestExecutionLevel user
- !tempfile EXE_HDR
- !packhdr "${EXE_HDR}" \
- '"toolkit\pfi-manifest.exe" \
- /FILE="${EXE_HDR}" \
- /NAME="POPFile.utility" \
- /DESCRIPTION="Intelligent front-end to SQLite command-line utility"'
-
#--------------------------------------------------------------------------
# Include private library functions and macro definitions
--- 99,102 ----
Index: adduser.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/adduser.nsi,v
retrieving revision 1.59.4.13
retrieving revision 1.59.4.14
diff -C2 -d -r1.59.4.13 -r1.59.4.14
*** adduser.nsi 8 Feb 2007 19:26:21 -0000 1.59.4.13
--- adduser.nsi 5 May 2007 12:28:07 -0000 1.59.4.14
***************
*** 219,229 ****
RequestExecutionLevel user
- !tempfile EXE_HDR
- !packhdr "${EXE_HDR}" \
- '"toolkit\pfi-manifest.exe" \
- /FILE="${EXE_HDR}" \
- /NAME="POPFile.wizard" \
- /DESCRIPTION="Add POPFile User wizard"'
-
;----------------------------------------------------------------------
; Default location for POPFile User Data files (popfile.cfg and others)
--- 219,222 ----
|
