Update of /cvsroot/monetdb/pathfinder/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29129/NT
Modified Files:
Tag: PF_ROX
Makefile
Log Message:
propagated changes of Thursday May 22 2008 - Saturday May 24 2008
from the development trunk to the PF_ROX branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/22 - sjoerd:
runtime/pf_support.mx,1.299(Current_DailyBuild-24,Current_DailyBuild-23)
Fixed some type punning problems.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - sjoerd: NT/Makefile,1.20(Current_DailyBuild-24)
NT/MonetDB4-XQuery/MonetDB4-XQuery64.sln,1.1(Stable_DailyBuild-24,Current_DailyBuild-24)
NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj,1.1(Stable_DailyBuild-24,Current_DailyBuild-24)
Added 64 bit Windows installer.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - sjoerd:
NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj,1.3(Stable_DailyBuild-24,Current_DailyBuild-24)
Use registry to store where the product is installed.
This means you only get to choose the location in MonetDB-Common.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - tsheyar:
compiler/algebra/prop/prop_key.c,1.47(Current_DailyBuild-24)
-- some recently added property inference (for path steps) was to optimistic.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - tsheyar:
compiler/semantics/subtyping.c,1.48(Current_DailyBuild-24)
-- Complete the hierarchy information (integer <-> decimal) for disjoint types.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/23 - lsidir: compiler/algebra/physical.c,1.69(Current_DailyBuild-24)
compiler/algebra/planner.c,1.62(Current_DailyBuild-24)
compiler/include/physical.h,1.45(Current_DailyBuild-24)
compiler/mil/milgen.brg,1.157(Current_DailyBuild-24)
compiler/mil/milprint.c,1.78(Current_DailyBuild-24)
implementation for id/idref...
works only for elements for now, but I wanted to commit before the branching.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/Makefile,v
retrieving revision 1.17.4.1
retrieving revision 1.17.4.2
diff -u -d -r1.17.4.1 -r1.17.4.2
--- Makefile 22 May 2008 08:48:26 -0000 1.17.4.1
+++ Makefile 24 May 2008 10:51:12 -0000 1.17.4.2
@@ -11,6 +11,11 @@
INSTALLER = MonetDB4-XQuery
INSTALLER_PREREQ = "$(prefix)\banner.bmp" "$(prefix)\license.rtf"
"$(prefix)\monetdb.ico"
+!IF $(bits) == 32
+IBITS =
+!ELSE
+IBITS = 64
+!ENDIF
UNISTD_H = unistd.h
@@ -36,12 +41,12 @@
$(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).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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
