Update of /cvsroot/monetdb/sql/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19015/NT
Modified Files:
Makefile
Log Message:
Added 64 bit Windows installer.
U Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile 20 May 2008 09:07:13 -0000 1.24
+++ Makefile 23 May 2008 07:32:58 -0000 1.25
@@ -12,6 +12,11 @@
INSTALLER = MonetDB5-SQL
INSTALLER_PREREQ = "$(prefix)\banner.bmp" "$(prefix)\license.rtf"
"$(prefix)\monetdb.ico"
+!IF $(bits) == 32
+IBITS =
+!ELSE
+IBITS = 64
+!ENDIF
!IFDEF HAVE_MONETDB5
RUNMSERVER5 = RunMserver5.bat
@@ -37,12 +42,12 @@
install: targetdirs all $(M4INSTALLER) $(M5INSTALLER) $(INSTALLER_PREREQ)
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) MSQLserver.bat "$(prefix)"
- $(INSTALL) $(INSTALLER)\$(INSTALLER).sln "$(prefix)"
- $(INSTALL) $(INSTALLER)\$(INSTALLER).vdproj "$(prefix)"
- devenv "$(prefix)\$(INSTALLER).sln" /build
- if exist "$(prefix)\$(INSTALLER).msi" del /f
"$(prefix)\$(INSTALLER).msi"
- $(INSTALL) /Y "$(prefix)"\Debug\$(INSTALLER).msi "$(prefix)"
- @-c:\cygwin\bin\chmod a+rx "$(prefix)\$(INSTALLER).msi"
+ $(INSTALL) $(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
+ $(INSTALL) $(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
+ devenv "$(prefix)\$(INSTALLER)$(IBITS).sln" /build
+ if exist "$(prefix)\$(INSTALLER)$(IBITS).msi" del /f
"$(prefix)\$(INSTALLER)$(IBITS).msi"
+ $(INSTALL) /Y "$(prefix)"\Debug\$(INSTALLER)$(IBITS).msi "$(prefix)"
+ @-c:\cygwin\bin\chmod a+rx "$(prefix)\$(INSTALLER)$(IBITS).msi"
"$(prefix)\banner.bmp":
$(INSTALL) "$(MONETDB_PREFIX)\banner.bmp" "$(prefix)\banner.bmp"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
