===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/Makefile,v
retrieving revision 1.13
retrieving revision 1.18
diff -u -p -r1.13 -r1.18
--- OpenXM_contrib2/windows/Makefile	2020/02/02 05:24:44	1.13
+++ OpenXM_contrib2/windows/Makefile	2022/03/30 04:58:53	1.18
@@ -1,4 +1,4 @@
-# $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.12 2019/03/28 18:10:10 ohara Exp $
+# $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.17 2021/05/12 08:27:26 ohara Exp $
 
 !if "$(ARCH)" == ""
 ARCH=$(PROCESSOR_ARCHITECTURE)
@@ -8,12 +8,12 @@ ARCH=$(PROCESSOR_ARCHITECTURE)
 OS = win64
 CANDLE_ARCH = -nologo -arch x64
 PGDIR=ProgramFiles64Folder
-PRODUCTID=5FCFE322-2C5D-4AF6-AB56-490A86831FD7
+PRODUCTID=EEC1D477-7925-4B4D-8484-5174FD6D97C5
 !else
 OS = win32
 CANDLE_ARCH = -nologo
 PGDIR=ProgramFilesFolder
-PRODUCTID=4B09EBA0-88B0-4CA5-B284-AA13AC6CCA72
+PRODUCTID=95F4A064-CFE0-45D4-AA55-F87921432478
 !endif
 
 # DO NOT CHANGE UPGRADEID!!
@@ -48,7 +48,7 @@ build: ..\asir-gc\gc\gc.lib asir2000lib\asir2000lib.li
 	cd ..\asir-gc && $(MAKE) -e -f Makefile.vc
 
 asir2000lib\asir2000lib.lib: ..\asir-gc\gc\gc.lib
-	cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH)
+	cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH) CC=clang-cl
 
 engine2000\engine.exe: asir2000lib\asir2000lib.lib
 	cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH)
@@ -63,45 +63,63 @@ post-msg-asirgui\cmdasir.exe:
 	cd $(@D) && $(MAKE) -e -f Makefile.vc
 
 ..\asir2018\asir.exe: ..\asir-gc\gc\gc.lib
-	cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH)
+	cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH) CC=clang-cl
 
-msi: $(TARGET)
+msi: $(TARGET) wxs
 	copy /b $(TARGET) asir_$(OS)_%DATE:/=.%.msi
 
 wxs: $(SRCS)
 
-zip:
-	@makepkg.bat
+mkdir:
+	if not exist asir ( mkdir asir\bin asir\lib\asir asir\lib\asir-contrib asir\share\editor asir\share\skel )
 
+!if "$(ARCH)" == "AMD64"
+GMPDIR=mpir\x64
+!else
+GMPDIR=mpir\win32
+!endif
+
+install: build mkdir
+	for %i in ( asir32gui\asirgui.exe asir32gui\ja.dll engine2000\engine.exe mcpp\cpp.exe post-msg-asirgui\cmdasir.exe ..\asir2018\asir.exe curl.exe unzip.exe $(GMPDIR)\*.dll ) do ( copy /b %i asir\bin )
+	echo import("names.rr")$$ end$$ > asir\share\skel\.asirrc
+	for %i in ( ..\asir2018\LICENSE gmp\COPYING.LIB ) do ( copy /b %i asir )
+	-robocopy post-msg-asirgui asir\share\editor asirgui.mac  asir-mode.el install-ja-sjis.txt /nfl /ndl /njh /njs /np 
+	-robocopy ..\asir2018\lib asir\lib\asir /nfl /ndl /njh /njs /np /xf help*.uu
+	-robocopy ..\..\OpenXM\src\asir-contrib\packages\src asir\lib\asir-contrib /nfl /ndl /njh /njs /np /mir /xd CVS /xf *.in *.c *.sh *-sh .keepme
+	-robocopy ..\..\OpenXM\src\asir-contrib\testing\noro asir\lib\asir-contrib de.rr gw.rr module_syz.rr mwl.rr rewrite.rr ndbf.rr /nfl /ndl /njh /njs /np
+	for %i in ( de.rr gw.rr module_syz.rr mwl.rr rewrite.rr ) do ( pushd asir\lib\asir-contrib && move %i noro_%i && popd)	
+	pushd asir\lib\asir-contrib && move ndbf.rr nn_ndbf.rr && popd
+
+zip: install
+	zip -r asir_$(OS)_%DATE:/=.%.zip asir
+
 $(TARGET): $(OBJS) LICENSE.rtf zip
 	$(LIGHT) $(LTFLAGS) -out $(TARGET) $(OBJS)
 
-## generating wxs files by heat if the directory asir exists
+## The wxs files were generated by heat.
+## To update _contrib.wxs, run nmake WXS=1 _contrib.wxs or run nmake WXS=1 wxs 
 
-# _lib.wxs:
-# 	cd asir\lib
-# 	$(HEAT) dir asir $(HEATFLAGS) -dr LIB_ASIR -cg LibGrp -var "var.libDir" -out ..\..\_lib.wxs
-# 	cd ..\..
-#
-# _help.wxs:
-# 	cd asir
-# 	$(HEAT) dir help $(HEATFLAGS) -dr HELP  -cg HelpGrp -var "var.helpDir"  -out ..\_help.wxs
-# 	cd ..
-#
-# _contrib.wxs:
-# 	cd asir\lib
-# 	$(HEAT) dir asir-contrib $(HEATFLAGS) -dr LIB_ASIR_CONTRIB -cg ContribGrp -var "var.contribDir" -out ..\..\_contrib.wxs
-# 	cd ..\..
-#
-# wxsclean:
-# 	@del /q _*.wxs
+!ifdef WXS
+_lib.wxs: zip
+	cd asir\lib && $(HEAT) dir asir $(HEATFLAGS) -dr LIB_ASIR -cg LibGrp -var "var.libDir" -out ..\..\_lib.wxs
 
+_help.wxs: zip
+	cd asir && $(HEAT) dir help $(HEATFLAGS) -dr HELP  -cg HelpGrp -var "var.helpDir"  -out ..\_help.wxs
+
+_contrib.wxs: zip
+	cd asir\lib && $(HEAT) dir asir-contrib $(HEATFLAGS) -dr LIB_ASIR_CONTRIB -cg ContribGrp -var "var.contribDir" -out ..\..\_contrib.wxs
+!endif
+
+wxsclean:
+	@del /q _*.wxs
+
 clean:
 	@del /q *.wixobj
 	@del /q *.wixpdb
 
 distclean: clean
-	@distclean.bat
+	@if exist asir ( rmdir /s /q asir )
+	@for %i in ( ..\asir-gc asir2000lib engine2000 mcpp asir32gui post-msg-asirgui ..\asir2018 ) do ( pushd %i && $(MAKE) -f Makefile.vc distclean && popd)
 
 msiclean:
 	@del /q $(TARGET)