Update of /cvsroot/monetdb/sql/NT
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28875/sql/NT
Modified Files:
Makefile
Log Message:
Implemented build directory support for Windows,
i.e., like on Unix/Linux also on Windows we can now build in a separate
build directory as alternative to ...\<package>\NT, and thus keep the
latter clean from files generated during the build.
As net effect, this allows to have multiple builds (e.g., different
compilers and/or BITS/OIDS settings using only one source tree
checkout (but separate build and prefix directories for each build).
Caveat:
On Windows, the build directory must be a sibling of ...\<package>\NT .
In essence, instead of
cd ...\<package>\NT
nmake /nologo ...
we can now do
mkdir ...\<package>\BUILD_DIR
cd ...\<package>\BUILD_DIR
nmake /nologo /f ..\NT\Makefile ...
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Makefile 2 Feb 2010 15:36:30 -0000 1.35
+++ Makefile 24 Mar 2010 16:18:53 -0000 1.36
@@ -8,7 +8,7 @@
prefix = $(MAKEDIR)
-!INCLUDE "$(TOPDIR)\rules.msc"
+!INCLUDE "$(TOPDIR)\..\NT\rules.msc"
INSTALLER = MonetDB5-SQL
INSTALLER_PREREQ = "$(prefix)\banner.bmp" "$(prefix)\license.rtf"
"$(prefix)\monetdb.ico"
@@ -27,9 +27,9 @@
install: targetdirs all install-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)$(IBITS).sln "$(prefix)"
- $(INSTALL) $(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
+ if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\MSQLserver.bat
"$(prefix)"
+ $(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
+ $(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" if "$(bits)" == "32"
C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/"
"$(prefix)\$(INSTALLER)$(IBITS).vdproj"
-devenv "$(prefix)\$(INSTALLER)$(IBITS).sln" /build
if exist "$(prefix)\$(INSTALLER)$(IBITS).msi" del /f
"$(prefix)\$(INSTALLER)$(IBITS).msi"
@@ -45,15 +45,15 @@
!IFDEF BITS32
install-m5installer:
- $(INSTALL) MonetDB5-SQL\MonetDB5-SQL-Installer.sln "$(prefix)"
- $(INSTALL) MonetDB5-SQL\MonetDB5-SQL-Installer.vdproj "$(prefix)"
+ $(INSTALL) ..\NT\MonetDB5-SQL\MonetDB5-SQL-Installer.sln "$(prefix)"
+ $(INSTALL) ..\NT\MonetDB5-SQL\MonetDB5-SQL-Installer.vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" C:\cygwin\bin\sed.exe -i "s/Program
Files/Program Files (x86)/" "$(prefix)\MonetDB5-SQL-Installer.vdproj"
!ENDIF
!IFDEF BITS64
install-m5installer:
- $(INSTALL) MonetDB5-SQL64\MonetDB5-SQL-Installer.sln "$(prefix)"
- $(INSTALL) MonetDB5-SQL64\MonetDB5-SQL-Installer.vdproj "$(prefix)"
+ $(INSTALL) ..\NT\MonetDB5-SQL64\MonetDB5-SQL-Installer.sln "$(prefix)"
+ $(INSTALL) ..\NT\MonetDB5-SQL64\MonetDB5-SQL-Installer.vdproj
"$(prefix)"
!ENDIF
$(SRCDIR)\Makefile.msc:
@@ -61,8 +61,8 @@
all-msc: sql_config.h
-sql_config.h: sql_config.h.in
- $(CONFIGURE) sql_config.h.in > sql_config.h
+sql_config.h: ..\NT\sql_config.h.in
+ $(CONFIGURE) ..\NT\sql_config.h.in > sql_config.h
unistd.h:
$(ECHO) #ifndef UNISTD_H > unistd.h
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
