You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by pa...@apache.org on 2005/04/14 01:05:11 UTC
cvs commit: tcl-rivet/win Rivet.nsi makefile.vc
patthoyts 2005/04/13 16:05:11
Modified: . ChangeLog
win Rivet.nsi makefile.vc
Log:
* win/Makefile.vc: Update the makefile and installer script
* win/Rivet.nsi: for the 0.5.0 release.
Revision Changes Path
1.225 +5 -0 tcl-rivet/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /home/cvs/tcl-rivet/ChangeLog,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- ChangeLog 24 Mar 2005 10:29:15 -0000 1.224
+++ ChangeLog 13 Apr 2005 23:05:10 -0000 1.225
@@ -1,3 +1,8 @@
+2005-04-14 Pat Thoyts <pa...@users.sourceforge.net>
+
+ * win/Makefile.vc: Update the makefile and installer script
+ * win/Rivet.nsi: for the 0.5.0 release.
+
2005-03-24 David N. Welton <da...@dedasys.com>
* Makefile.am (EXTRA_DIST): Added the doc, rivet and debian
1.2 +14 -14 tcl-rivet/win/Rivet.nsi
Index: Rivet.nsi
===================================================================
RCS file: /home/cvs/tcl-rivet/win/Rivet.nsi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Rivet.nsi 3 Aug 2004 00:01:48 -0000 1.1
+++ Rivet.nsi 13 Apr 2005 23:05:10 -0000 1.2
@@ -29,7 +29,7 @@
!include "MUI.nsh"
Name "Rivet"
-OutFile "Rivet040.exe"
+OutFile "Rivet050.exe"
SetCompressor lzma
CRCCheck on
ShowInstDetails hide
@@ -41,11 +41,11 @@
;; -------------------------------------------------------------------------
;; Version resource
;;
-ViProductVersion "0.4.0.0"
+ViProductVersion "0.5.0.0"
VIAddVersionKey ProductName "Rivet"
VIAddVersionKey CompanyName "Apache Software Foundation"
-VIAddVersionKey FileVersion "0.4.0.1"
-VIAddVersionKey ProductVersion "0.4.0.0"
+VIAddVersionKey FileVersion "0.5.0.1"
+VIAddVersionKey ProductVersion "0.5.0.0"
VIAddVersionKey LegalCopyright "Copyright (c) 2004 The Apache Software Foundation"
VIAddVersionKey FileDescription "Apache Rivet Installer"
@@ -142,15 +142,15 @@
DetailPrint "Adjusting INSTDIR to point at the library folder."
TclFalse:
- SetOutPath "$INSTDIR\rivet0.4.0"
+ SetOutPath "$INSTDIR\rivet0.5.0"
File /r "..\rivet\rivet-tcl"
File /r "..\rivet\packages"
File "..\rivet\init.tcl"
File "..\rivet\pkgIndex.tcl"
File "..\rivet\README"
- RMDir /r "$INSTDIR\rivet0.4.0\packages\CVS"
- RMDir /r "$INSTDIR\rivet0.4.0\rivet-tcl\CVS"
- SetOutPath "$INSTDIR\rivet0.4.0\packages\rivet"
+ RMDir /r "$INSTDIR\rivet0.5.0\packages\CVS"
+ RMDir /r "$INSTDIR\rivet0.5.0\rivet-tcl\CVS"
+ SetOutPath "$INSTDIR\rivet0.5.0\packages\rivet"
File "Release\rivet.dll"
File "Release\rivetparser.dll"
FileOpen $R6 "pkgIndex.tcl" "w"
@@ -159,11 +159,11 @@
FileClose $R6
SetOutPath "$APACHE_DIR\modules"
File "Release\mod_rivet.so"
- WriteUninstaller "$INSTDIR\rivet0.4.0\Uninstall.exe"
+ WriteUninstaller "$INSTDIR\rivet0.5.0\Uninstall.exe"
SectionEnd
Section "Documentation" SecDocs
- SetOutPath "$INSTDIR\rivet0.4.0"
+ SetOutPath "$INSTDIR\rivet0.5.0"
File "..\doc\Rivet.chm"
SectionEnd
@@ -177,8 +177,8 @@
FileWrite $R6 " RivetServerConf CacheSize 50$\r$\n"
FileWrite $R6 " AddType application/x-httpd-rivet .rvt$\r$\n"
FileWrite $R6 " AddType application/x-rivet-tcl .tcl$\r$\n$\r$\n"
- FileWrite $R6 " Alias /rivet/ $\"$INSTDIR/rivet0.4.0/tests/$\"$\r$\n"
- FileWrite $R6 " <Directory $\"$INSTDIR/rivet0.4.0/tests/$\">$\r$\n"
+ FileWrite $R6 " Alias /rivet/ $\"$INSTDIR/rivet0.5.0/tests/$\"$\r$\n"
+ FileWrite $R6 " <Directory $\"$INSTDIR/rivet0.5.0/tests/$\">$\r$\n"
FileWrite $R6 " Options Indexes FollowSymlinks MultiViews$\r$\n"
FileWrite $R6 " AllowOverride None$\r$\n"
FileWrite $R6 " Order allow,deny$\r$\n"
@@ -195,7 +195,7 @@
SectionEnd
Section /o "Test files" SecTests
- SetOutPath "$INSTDIR\rivet0.4.0\tests"
+ SetOutPath "$INSTDIR\rivet0.5.0\tests"
File "..\tests\*.*"
SectionEnd
1.7 +16 -6 tcl-rivet/win/makefile.vc
Index: makefile.vc
===================================================================
RCS file: /home/cvs/tcl-rivet/win/makefile.vc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- makefile.vc 3 Aug 2004 00:01:48 -0000 1.6
+++ makefile.vc 13 Apr 2005 23:05:10 -0000 1.7
@@ -156,7 +156,7 @@
PROJECT = rivet
!include "rules.vc"
-DOTVERSION = 0.4.0
+DOTVERSION = 0.5.0
VERSION = $(DOTVERSION:.=)
STUBPREFIX = $(PROJECT)stub
@@ -405,7 +405,7 @@
# Create the Windows Nullsoft installer file.
MAKENSIS="C:\Program Files\NSIS\MakeNSIS.exe"
-installer: $(PROJECT)
+installer: $(PROJECT) pkgIndex
$(MAKENSIS) $(PROJECT).nsi
#---------------------------------------------------------------------
@@ -451,6 +451,18 @@
#
#---------------------------------------------------------------------
+pkgIndex:
+ @echo Creating package index script
+ @tclsh <<
+cd [file join $(ROOT) rivet]
+eval pkg_mkIndex . init.tcl [glob [file join packages * *.tcl] [file join *[info sharedlibextension]]]
+set f [open pkgIndex.tcl a+]
+puts $$f {
+package ifneeded Rivet 1.1 [list load [file join $$dir packages rivet rivet.dll]]
+package ifneeded rivetparser 0.2 [list load [file join $$dir packages rivet rivetparser.dll]]
+}
+<<
+
install-binaries:
@echo Installing to '$(SCRIPT_INSTALL_DIR)'
@if not exist $(SCRIPT_INSTALL_DIR)\nul mkdir $(SCRIPT_INSTALL_DIR)
@@ -463,11 +475,9 @@
@echo Installing $(MOD_RIVET) to $(APACHE_MODULES_DIR)
@$(CPY) $(MOD_RIVET) $(APACHE_MODULES_DIR)
-install-libraries:
+install-libraries: pkgIndex
@echo Installing to '$(SCRIPT_INSTALL_DIR)'
@if exist $(LIBDIR)\nul $(CPY) /s $(LIBDIR) $(SCRIPT_INSTALL_DIR)
- @cd $(SCRIPT_INSTALL_DIR)\packages\rivet
- @echo pkg_mkIndex -verbose . | $(TCLSH)
install-docs:
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org