Changeset 2330

Timestamp:

05/10/2008 16:23:16 (4 years ago)

Author:

chris

Message:

Substitute parcel directory and Box version into InstallJammer? config
file for Windows installer.

Location:

box/trunk

Files:

• configure.ac (modified) (2 diffs)
• contrib/windows/installer/boxbackup.mpi.in (moved) (moved from box/trunk/contrib/windows/installer/boxbackup.mpi) (2 diffs)

box/trunk/configure.ac

@@ -307 +307 @@
 AC_SUBST([localstatedir_expanded])
 
+## Figure out the client parcel directory and substitute it
+client_parcel_dir=`perl infrastructure/parcelpath.pl client $target_os`
+os_name=`uname -o`
+if test "$os_name" = "Cygwin"; then
+        client_parcel_dir=`cygpath -wa $client_parcel_dir`
+fi
+AC_SUBST([client_parcel_dir])
+
+## Figure out version and substitute it in
+box_version=`perl infrastructure/printversion.pl`
+AC_SUBST([box_version])
 
 ### Output files
@@ -324 +335 @@
                    contrib/solaris/bbackupd-smf-method
                    contrib/solaris/bbstored-smf-method
+                   contrib/windows/installer/boxbackup.mpi
                    infrastructure/makebuildenv.pl
                    infrastructure/makeparcels.pl

box/trunk/contrib/windows/installer/boxbackup.mpi.in

@@ -22 +22 @@
 
 BBVersionNo
-1857
+@box_version@
 
 BrandName
@@ -274 +274 @@
 }
 FileGroup ::481451CC-F49C-D389-8645076F595B -setup Install -active Yes -platforms {Windows MacOS-X} -name {Program Files} -parent FileGroups
-File ::B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 -filemethod {Update files with more recent dates} -type dir -directory <%InstallDir%> -name /home/petjal/doc/teb/cli/bu/installer/win/2.2 -location C:/cygwin/home/Chris/general/parcels/boxbackup-chris_general_1988M-backup-client-mingw32 -parent 481451CC-F49C-D389-8645076F595B
+File ::B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 -filemethod {Update files with more recent dates} -type dir -directory <%InstallDir%> -name /home/petjal/doc/teb/cli/bu/installer/win/2.2 -location @client_parcel_dir@ -parent 481451CC-F49C-D389-8645076F595B
 File ::CDDED10B-2747-DD07-5F9D-42A7FD7BB7E6 -name LICENSE.txt -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2
 File ::D6E262BC-8A84-B6DB-794B-8FDC8AECB079 -name mgwz.dll -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2