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

Diff for /OpenXM_contrib2/windows/Makefile between version 1.4 and 1.7

version 1.4, 2014/03/30 22:29:46 version 1.7, 2014/05/14 03:50:15
Line 1 
Line 1 
 # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.3 2013/12/17 19:22:43 ohara Exp $  # $OpenXM: OpenXM_contrib2/windows/Makefile,v 1.6 2014/05/09 18:32:13 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=A73252DC-E8C3-4C0D-8DAE-FA580B948B20  PRODUCTID=50A5B5C0-DA6D-4F10-BA45-CD5FA21EC30A
 !else  !else
 OS = win32  OS = win32
 CANDLE_ARCH = -nologo  CANDLE_ARCH = -nologo
 PGDIR=ProgramFilesFolder  PGDIR=ProgramFilesFolder
 PRODUCTID=FC1DC24C-9B40-416D-8C8D-B087B8CE5375  PRODUCTID=476257AD-500D-4966-B792-1568697B3654
 !endif  !endif
   
 UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D  UPGRADEID=B7A582F5-0484-4030-9D38-BFAE00707F0D
 PRODUCTVER=1.0.3  PRODUCTVER=1.0.3
   
 TARGET= asir$(OS).msi  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= asir.wixobj _lib.wixobj _contrib.wixobj _help.wixobj _share.wixobj
 OBJS= $(SRCS:.wxs=.wixobj)  OBJS= $(SRCS:.wxs=.wixobj)
   
 CANDLE = candle -nologo  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 -dcontribDir=asir\lib-asir-contrib \    -dlibDir=asir\lib\asir -dcontribDir=asir\lib\asir-contrib \
   -dhelpDir=asir\help -dshareDir=asir\share    -dhelpDir=asir\help -dshareDir=asir\share -ddocDir=asir\doc
 LIGHT = light -nologo  LIGHT = light -nologo
 LTFLAGS = -ext WixUIExtension -ext WixUtilExtension  LTFLAGS = -ext WixUIExtension -ext WixUtilExtension
 HEAT = heat  HEAT = heat
Line 55  $(TARGET): $(OBJS) LICENSE.rtf zip
Line 55  $(TARGET): $(OBJS) LICENSE.rtf zip
 ## generating wxs files by heat if the directory asir exists  ## generating wxs files by heat if the directory asir exists
   
 # _lib.wxs:  # _lib.wxs:
 #       cd asir  #       cd asir\lib
 #       $(HEAT) dir lib $(HEATFLAGS) -dr LIB -cg LibGrp -var "var.libDir" -out ..\_lib.wxs  #       $(HEAT) dir asir $(HEATFLAGS) -dr LIB_ASIR -cg LibGrp -var "var.libDir" -out ..\..\_lib.wxs
 #       cd ..  #       cd ..\..
 #  #
 # _help.wxs:  # _help.wxs:
 #       cd asir  #       cd asir
Line 70  $(TARGET): $(OBJS) LICENSE.rtf zip
Line 70  $(TARGET): $(OBJS) LICENSE.rtf zip
 #       cd ..  #       cd ..
 #  #
 # _contrib.wxs:  # _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  #       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 ..  #       cd ..
 #  #
 # wxsclean:  # wxsclean:
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.7
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>