[BACK]Return to Makefile CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / windows

Diff for /OpenXM_contrib2/windows/Makefile between version 1.10 and 1.17

version 1.10, 2015/03/12 18:11:21 version 1.17, 2021/05/12 08:27:26
Line 1 
Line 1 
 # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.9 2015/03/07 03:57:13 ohara Exp $  # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.16 2021/03/25 06:31:59 ohara Exp $
   
 !if "$(ARCH)" == ""  !if "$(ARCH)" == ""
 ARCH=$(PROCESSOR_ARCHITECTURE)  ARCH=$(PROCESSOR_ARCHITECTURE)
Line 8  ARCH=$(PROCESSOR_ARCHITECTURE)
Line 8  ARCH=$(PROCESSOR_ARCHITECTURE)
 OS = win64  OS = win64
 CANDLE_ARCH = -nologo -arch x64  CANDLE_ARCH = -nologo -arch x64
 PGDIR=ProgramFiles64Folder  PGDIR=ProgramFiles64Folder
 PRODUCTID=B17693DD-3D87-4AF4-8AE4-CC8611F9887B  PRODUCTID=EEC1D477-7925-4B4D-8484-5174FD6D97C5
 !else  !else
 OS = win32  OS = win32
 CANDLE_ARCH = -nologo  CANDLE_ARCH = -nologo
 PGDIR=ProgramFilesFolder  PGDIR=ProgramFilesFolder
 PRODUCTID=9EAF4244-6960-498D-AE8C-6F3FFAAAF662  PRODUCTID=95F4A064-CFE0-45D4-AA55-F87921432478
 !endif  !endif
   
 # DO NOT CHANGE UPGRADEID!!  # DO NOT CHANGE UPGRADEID!!
 UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D  UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D
 PRODUCTVER=1.0.6  PRODUCTVER=1.1.0
   
 TARGET= asir$(OS).msi  TARGET= asir$(OS).msi
 SRCS= asir.wxs _lib.wxs _contrib.wxs _help.wxs _share.wxs _doc.wxs  SRCS= asir.wxs _lib.wxs _contrib.wxs _share.wxs
 # OBJS= asir.wixobj _lib.wixobj _contrib.wixobj _help.wixobj _share.wixobj  # OBJS= asir.wixobj _lib.wixobj _contrib.wixobj _help.wixobj _share.wixobj
 OBJS= $(SRCS:.wxs=.wixobj)  OBJS= $(SRCS:.wxs=.wixobj)
   
Line 29  CANDLE = candle -nologo
Line 29  CANDLE = candle -nologo
 CANDLE_FLAGS = $(CANDLE_ARCH) -dprogramfilesDir=$(PGDIR) \  CANDLE_FLAGS = $(CANDLE_ARCH) -dprogramfilesDir=$(PGDIR) \
   -dupgradeID=$(UPGRADEID) -dproductID=$(PRODUCTID) -dproductVer=$(PRODUCTVER) \    -dupgradeID=$(UPGRADEID) -dproductID=$(PRODUCTID) -dproductVer=$(PRODUCTVER) \
   -dlibDir=asir\lib\asir -dcontribDir=asir\lib\asir-contrib \    -dlibDir=asir\lib\asir -dcontribDir=asir\lib\asir-contrib \
   -dhelpDir=asir\help -dshareDir=asir\share -ddocDir=asir\doc    -dshareDir=asir\share
 LIGHT = light -nologo  LIGHT = light -nologo
 LTFLAGS = -ext WixUIExtension -ext WixUtilExtension  LTFLAGS = -ext WixUIExtension -ext WixUtilExtension
 HEAT = heat  HEAT = heat
Line 40  HEATFLAGS = -nologo -gg -g1 -sfrag -srd
Line 40  HEATFLAGS = -nologo -gg -g1 -sfrag -srd
 .wxs.wixobj:  .wxs.wixobj:
         $(CANDLE) $(CANDLE_FLAGS) $<          $(CANDLE) $(CANDLE_FLAGS) $<
   
 all:  all: build
   
 msi: $(TARGET)  build: ..\asir-gc\gc\gc.lib asir2000lib\asir2000lib.lib engine2000\engine.exe asir32gui\asirgui.exe mcpp\cpp.exe post-msg-asirgui\cmdasir.exe ..\asir2018\asir.exe
   
   ..\asir-gc\gc\gc.lib:
           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)
   
   engine2000\engine.exe: asir2000lib\asir2000lib.lib
           cd $(@D) && $(MAKE) -e -f Makefile.vc ARCH=$(ARCH)
   
   asir32gui\asirgui.exe:
           cd $(@D) && $(MAKE) -e -f Makefile.vc
   
   mcpp\cpp.exe:
           cd $(@D) && $(MAKE) -e -f Makefile.vc
   
   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)
   
   msi: $(TARGET) wxs
         copy /b $(TARGET) asir_$(OS)_%DATE:/=.%.msi          copy /b $(TARGET) asir_$(OS)_%DATE:/=.%.msi
   
 wxs: $(SRCS)  wxs: $(SRCS)
   
 zip:  mkdir:
         @makepkg.bat          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  $(TARGET): $(OBJS) LICENSE.rtf zip
         $(LIGHT) $(LTFLAGS) -out $(TARGET) $(OBJS)          $(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:  !ifdef WXS
 #       cd asir\lib  _lib.wxs: zip
 #       $(HEAT) dir asir $(HEATFLAGS) -dr LIB_ASIR -cg LibGrp -var "var.libDir" -out ..\..\_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 ..  
 #  
 # _share.wxs:  
 #       cd asir  
 #       $(HEAT) dir share $(HEATFLAGS) -dr SHARE -cg ShareGrp -var "var.shareDir" -out ..\_share.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 ..\..  
 #  
 # _doc.wxs:  
 #       cd asir  
 #       $(HEAT) dir doc $(HEATFLAGS) -dr DOC -cg DocGrp -var "var.docDir" -out ..\_doc.wxs  
 #       cd ..  
 #  
 # wxsclean:  
 #       @del /q _*.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:  clean:
         @del /q *.wixobj          @del /q *.wixobj
         @del /q *.wixpdb          @del /q *.wixpdb
   
 distclean: clean  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:  msiclean:
         @del /q $(TARGET)          @del /q $(TARGET)
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.17
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>