===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/Makefile,v
retrieving revision 1.1
retrieving revision 1.8
diff -u -p -r1.1 -r1.8
--- OpenXM_contrib2/windows/Makefile	2013/11/16 08:31:31	1.1
+++ OpenXM_contrib2/windows/Makefile	2014/12/31 19:57:00	1.8
@@ -1,4 +1,4 @@
-# $OpenXM$
+# $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.7 2014/05/14 03:50:15 ohara Exp $
 
 !if "$(ARCH)" == ""
 ARCH=$(PROCESSOR_ARCHITECTURE)
@@ -8,29 +8,29 @@ ARCH=$(PROCESSOR_ARCHITECTURE)
 OS = win64
 CANDLE_ARCH = -nologo -arch x64
 PGDIR=ProgramFiles64Folder
-PRODUCTID=D1DCD556-D731-4945-8A6B-FABA98592818
+PRODUCTID=0C667F26-E4B0-4669-A4DE-2929622F9BA2
 !else
 OS = win32
 CANDLE_ARCH = -nologo
 PGDIR=ProgramFilesFolder
-PRODUCTID=CB31249B-D861-4D97-9146-08FADCBA312A
+PRODUCTID=DA2D90B3-D4D8-44EE-B121-3451D329DE02
 !endif
 
 UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D
-PRODUCTVER=1.0.0
+PRODUCTVER=1.0.4
 
-TARGET= asir_$(OS).msi
-SRCS= asir.wxs _lib.wxs _contrib.wxs _help.wxs _share.wxs
+TARGET= asir$(OS).msi
+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
+LTFLAGS = -ext WixUIExtension -ext WixUtilExtension
 HEAT = heat
 HEATFLAGS = -nologo -gg -g1 -sfrag -srd
 
@@ -46,18 +46,18 @@ msi: $(TARGET)
 
 wxs: $(SRCS)
 
-build_zip:
+zip:
 	@makepkg.bat
 
-$(TARGET): $(OBJS) LICENSE.rtf build_zip
+$(TARGET): $(OBJS) LICENSE.rtf zip
 	$(LIGHT) $(LTFLAGS) -out $(TARGET) $(OBJS)
 
 ## 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 +70,13 @@ $(TARGET): $(OBJS) LICENSE.rtf build_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: