Update of /cvsroot/monetdb/pathfinder/NT
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25926/NT
Modified Files:
Tag: M5XQ
Makefile
Log Message:
propagated changes of Saturday Mar 27 2010
from the XQFT branch to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/03/27 - stmane: NT/Makefile,1.26.4.2
propagated changes of Wednesday Mar 24 2010 - Saturday Mar 27 2010
from the development trunk to the XQFT branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/03/24 - stmane: NT/Makefile,1.28
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/pathfinder/NT/Makefile,v
retrieving revision 1.23.6.4
retrieving revision 1.23.6.5
diff -u -d -r1.23.6.4 -r1.23.6.5
--- Makefile 2 Feb 2010 15:37:59 -0000 1.23.6.4
+++ Makefile 27 Mar 2010 12:27:06 -0000 1.23.6.5
@@ -7,7 +7,7 @@
prefix = $(MAKEDIR)
-!INCLUDE "$(TOPDIR)\rules.msc"
+!INCLUDE "$(TOPDIR)\..\NT\rules.msc"
INSTALLER = MonetDB4-XQuery
INSTALLER_PREREQ = "$(prefix)\banner.bmp" "$(prefix)\license.rtf"
"$(prefix)\monetdb.ico"
@@ -28,22 +28,22 @@
!IFDEF BITS32
install-installer:
- $(INSTALL) MonetDB4-XQuery\MonetDB4-XQuery-Installer.sln "$(prefix)"
- $(INSTALL) MonetDB4-XQuery\MonetDB4-XQuery-Installer.vdproj "$(prefix)"
+ $(INSTALL) ..\NT\MonetDB4-XQuery\MonetDB4-XQuery-Installer.sln
"$(prefix)"
+ $(INSTALL) ..\NT\MonetDB4-XQuery\MonetDB4-XQuery-Installer.vdproj
"$(prefix)"
-if exist "C:\Program Files (x86)" C:\cygwin\bin\sed.exe -i "s/Program
Files/Program Files (x86)/" "$(prefix)\MonetDB4-XQuery-Installer.vdproj"
!ENDIF
!IFDEF BITS64
install-installer:
- $(INSTALL) MonetDB4-XQuery64\MonetDB4-XQuery-Installer.sln "$(prefix)"
- $(INSTALL) MonetDB4-XQuery64\MonetDB4-XQuery-Installer.vdproj
"$(prefix)"
+ $(INSTALL) ..\NT\MonetDB4-XQuery64\MonetDB4-XQuery-Installer.sln
"$(prefix)"
+ $(INSTALL) ..\NT\MonetDB4-XQuery64\MonetDB4-XQuery-Installer.vdproj
"$(prefix)"
!ENDIF
install: targetdirs pf_config.h all install-installer $(INSTALLER_PREREQ)
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
- if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) MXQserver.bat "$(prefix)"
- if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) pf.bat "$(prefix)"
- $(INSTALL) $(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
- $(INSTALL) $(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
+ if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\MXQserver.bat
"$(prefix)"
+ if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) ..\NT\pf.bat "$(prefix)"
+ $(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
+ $(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj "$(prefix)"
-devenv "$(prefix)\$(INSTALLER)$(IBITS).sln" /build
if exist "$(prefix)\$(INSTALLER)$(IBITS).msi" del /f
"$(prefix)\$(INSTALLER)$(IBITS).msi"
if exist "$(prefix)\Debug\$(INSTALLER)$(IBITS).msi" $(INSTALL) /Y
"$(prefix)"\Debug\$(INSTALLER)$(IBITS).msi "$(prefix)"
@@ -61,8 +61,8 @@
all-msc: pf_config.h
-pf_config.h: pf_config.h.in
- $(CONFIGURE) pf_config.h.in > pf_config.h
+pf_config.h: ..\NT\pf_config.h.in
+ $(CONFIGURE) ..\NT\pf_config.h.in > pf_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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
