=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/Makefile,v retrieving revision 1.5 retrieving revision 1.10 diff -u -p -r1.5 -r1.10 --- OpenXM_contrib2/windows/Makefile 2014/03/30 22:33:43 1.5 +++ OpenXM_contrib2/windows/Makefile 2015/03/12 18:11:21 1.10 @@ -1,4 +1,4 @@ -# $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.4 2014/03/30 22:29:46 ohara Exp $ +# $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.9 2015/03/07 03:57:13 ohara Exp $ !if "$(ARCH)" == "" ARCH=$(PROCESSOR_ARCHITECTURE) @@ -8,27 +8,28 @@ ARCH=$(PROCESSOR_ARCHITECTURE) OS = win64 CANDLE_ARCH = -nologo -arch x64 PGDIR=ProgramFiles64Folder -PRODUCTID=50A5B5C0-DA6D-4F10-BA45-CD5FA21EC30A +PRODUCTID=B17693DD-3D87-4AF4-8AE4-CC8611F9887B !else OS = win32 CANDLE_ARCH = -nologo PGDIR=ProgramFilesFolder -PRODUCTID=476257AD-500D-4966-B792-1568697B3654 +PRODUCTID=9EAF4244-6960-498D-AE8C-6F3FFAAAF662 !endif +# DO NOT CHANGE UPGRADEID!! UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D -PRODUCTVER=1.0.3 +PRODUCTVER=1.0.6 TARGET= asir$(OS).msi -SRCS= asir.wxs _lib.wxs _contrib.wxs _help.wxs _share.wxs +SRCS= asir.wxs _lib.wxs _contrib.wxs _help.wxs _share.wxs _doc.wxs # OBJS= asir.wixobj _lib.wixobj _contrib.wixobj _help.wixobj _share.wixobj OBJS= $(SRCS:.wxs=.wixobj) CANDLE = candle -nologo CANDLE_FLAGS = $(CANDLE_ARCH) -dprogramfilesDir=$(PGDIR) \ -dupgradeID=$(UPGRADEID) -dproductID=$(PRODUCTID) -dproductVer=$(PRODUCTVER) \ - -dlibDir=asir\lib -dcontribDir=asir\lib-asir-contrib \ - -dhelpDir=asir\help -dshareDir=asir\share + -dlibDir=asir\lib\asir -dcontribDir=asir\lib\asir-contrib \ + -dhelpDir=asir\help -dshareDir=asir\share -ddocDir=asir\doc LIGHT = light -nologo LTFLAGS = -ext WixUIExtension -ext WixUtilExtension HEAT = heat @@ -55,9 +56,9 @@ $(TARGET): $(OBJS) LICENSE.rtf zip ## generating wxs files by heat if the directory asir exists # _lib.wxs: -# cd asir -# $(HEAT) dir lib $(HEATFLAGS) -dr LIB -cg LibGrp -var "var.libDir" -out ..\_lib.wxs -# cd .. +# cd asir\lib +# $(HEAT) dir asir $(HEATFLAGS) -dr LIB_ASIR -cg LibGrp -var "var.libDir" -out ..\..\_lib.wxs +# cd ..\.. # # _help.wxs: # cd asir @@ -70,8 +71,13 @@ $(TARGET): $(OBJS) LICENSE.rtf zip # cd .. # # _contrib.wxs: +# cd asir\lib +# $(HEAT) dir asir-contrib $(HEATFLAGS) -dr LIB_ASIR_CONTRIB -cg ContribGrp -var "var.contribDir" -out ..\..\_contrib.wxs +# cd ..\.. +# +# _doc.wxs: # cd asir -# $(HEAT) dir lib-asir-contrib $(HEATFLAGS) -dr LIB_ASIR_CONTRIB -cg ContribGrp -var "var.contribDir" -out ..\_contrib.wxs +# $(HEAT) dir doc $(HEATFLAGS) -dr DOC -cg DocGrp -var "var.docDir" -out ..\_doc.wxs # cd .. # # wxsclean: