Diff for /imach/src/Makefile between versions 1.50 and 1.77

version 1.50, 2015/01/03 16:16:07 version 1.77, 2015/12/16 08:52:07
Line 1 Line 1
 VERSION=0.98p  #Version has to be set in ../CMakeLists.txt too.
 COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)  #VERSION=0.98r2
 IMACHSETUPVERSION=ilc64  #VERSION=$(shell echo `grep IMACH_VERSION__ version.h | echo 'titi'`)
   VERSION=$(shell echo `grep IMACH_VERSION__ version.h | awk 'BEGIN { FS = "[ \t\n\"]+" }  { print $$3 }'`)
   OSTYPE = $(shell echo $$OSTYPE)
   # DRIVEG is for VirtualBox Windows 64bit 
   DRIVEG=f:
   #DIRG is the corresponding build directory for Virtual Windows
   DIRG=\imach\cvs\imach\build
   COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015
   IMACHSETUPVERSION=icl
   # This is for Windows only
   #IMACHSETUPVERSION=mvc
   
 #       Linux  #       Linux
 # make _linux=1 imachopt  # make _linux=1 imachopt
 # make _linux=1 imach  # make _linux=1 imach
 #  # make _linux=1 imachrpm
   # cd to build/gnulinux ; cmake ../..; cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM
 # make _linux32onosx=1 imachopt  # make _linux32onosx=1 imachopt
 # make _linux64onosx=1 imachopt  # make _linux64onosx=1 imachopt
   
 #       OS/X  #       OS/X
   # make _macosx=1 imachdmg
 # make _intel64onosx=1 imachopt  # make _intel64onosx=1 imachopt
 # make _intel32onosx=1 imachopt  # make _intel32onosx=1 imachopt
 # make _intelUNBonosx=1 imachdmg # Not implemented (not useful)  # make _intelUNBonosx=1 imachdmg # Not implemented (not useful)
 # make _macosx=1 imach  # make _macosx=1 imach
 # make _macosx=1 imachopt  # make _macosx=1 imachopt
 # make _macosx=1 imachdmg  
 #  valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ~/Documents/imachcvs/imach/src/imach-1.129cvsmac radlc-1.129.imach  #  valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ~/Documents/imachcvs/imach/src/imach-1.129cvsmac radlc-1.129.imach
   
 #        Windows  #        Windows
 # make _windowsonosx=1 imachILC64-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl  # make _windowsonosx=1 imachICL-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
 # make _windowsonosx=1 imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl  # make _windowsonosx=1 imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
 # make imachMVC-noreg-setup  # make _windowsonosx=1 imachMVC-noreg-setup
 #  #
 #        Windows cross-compiled mw64  #        Windows cross-compiled mw64
 # make _mw64onsox=1 imachcyg-setup  # make _mw64onsox=1 imachcyg-setup
Line 41  IMACHSETUPVERSION=ilc64 Line 52  IMACHSETUPVERSION=ilc64
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"  ##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"
 #TESTFILE=$$HOME/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach  #TESTFILE=$$HOME/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/carol/carol-june2014/educadlmwt24.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/carol/carol-june2014/educadlmwt24.imach
 TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-wopowell.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-wopowell.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/rbiaspar-098p.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Aaron/brouard/results/COVARAITE_94/rmypar24pis1cov1-age.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/rADL0w_V1V2b.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/rrtest3b.imach
   TESTFILE=$(HOME)//Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
 #CC= gcc -v  #CC= gcc -v
Line 51  GCC= gcc Line 67  GCC= gcc
 ifdef _macosx  ifdef _macosx
 # Mac OS/X version  # Mac OS/X version
 LFLAGS= -g -lm   LFLAGS= -g -lm 
 CFLAGS= -g -DDEBUG   #CFLAGS= -g -DDEBUG 
   CFLAGS= -g 
 LFLAGSOPT= -O3 -lm   LFLAGSOPT= -O3 -lm 
 CFLAGSOPT= -O3   CFLAGSOPT= -O3 
   CP= cp
   CROSSCOMPILATION= -DCROSS=0
 UNIX2DOS= echo "Unix2dos "   UNIX2DOS= echo "Unix2dos " 
 DSYMUTIL= dsymutil  DSYMUTIL= dsymutil
 STRIP= strip  STRIP= strip
Line 89  LFLAGS= -g Line 108  LFLAGS= -g
 CFLAGS= -g  CFLAGS= -g
 LFLAGSOPT= -O3 -lm  LFLAGSOPT= -O3 -lm
 CFLAGSOPT= -O3  CFLAGSOPT= -O3
   CROSSCOMPILATION= -DCROSS=1
 CP= cp  CP= cp
 UNIX2DOS= unix2dos  UNIX2DOS= unix2dos
 SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"  SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
Line 104  LFLAGS= -g Line 124  LFLAGS= -g
 CFLAGS= -g  CFLAGS= -g
 LFLAGSOPT= -O3 -s  LFLAGSOPT= -O3 -s
 CFLAGSOPT= -O3  CFLAGSOPT= -O3
   CROSSCOMPILATION= -DCROSS=1
 UNIX2DOS= unix2dos  UNIX2DOS= unix2dos
 SETUPCOMP= ~/bin/InnoSetup5Playonmac  SETUPCOMP= ~/bin/InnoSetup5Playonmac
 CP= cp  CP= cp
Line 117  LFLAGS= -g Line 138  LFLAGS= -g
 CFLAGS= -g  CFLAGS= -g
 LFLAGSOPT= -O3 -lm -s  LFLAGSOPT= -O3 -lm -s
 CFLAGSOPT= -O3  CFLAGSOPT= -O3
   CROSSCOMPILATION= -DCROSS=1
 UNIX2DOS= unix2dos  UNIX2DOS= unix2dos
 SETUPCOMP= ~/bin/InnoSetup5Playonmac  SETUPCOMP= ~/bin/InnoSetup5Playonmac
 CP= cp  CP= cp
Line 133  ifdef _intel64onosx Line 155  ifdef _intel64onosx
 GCC=/opt/intel/bin/icc  GCC=/opt/intel/bin/icc
 CFLAGS= -m64 -g -std=c99  CFLAGS= -m64 -g -std=c99
 LFLAGS= -g -m64  LFLAGS= -g -m64
   #CFLAGSOPT= -O3 -m64 -g -std=c99 -no-prec-div idem
   #CFLAGSOPT= -O3 -m64 -g -std=c99 -xSSSE3_ATOM 402
 CFLAGSOPT= -O3 -m64 -g -std=c99  CFLAGSOPT= -O3 -m64 -g -std=c99
   CROSSCOMPILATION= -DCROSS=0
 IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh intel64; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv")  IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh intel64; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv")
 include makeenv  include makeenv
 #lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld  #lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld
Line 151  GCC=/opt/intel/bin/icc Line 176  GCC=/opt/intel/bin/icc
 CFLAGS= -m32 -g -std=c99  CFLAGS= -m32 -g -std=c99
 LFLAGS= -g -m32  LFLAGS= -g -m32
 CFLAGSOPT= -O3 -m32 -g -std=c99  CFLAGSOPT= -O3 -m32 -g -std=c99
   CROSSCOMPILATION= -DCROSS=0
 IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh ia32; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv")  IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh ia32; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv")
 include makeenv  include makeenv
 #lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld  #lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld
Line 163  BINVERSION=osx-intel-ia32-bin Line 189  BINVERSION=osx-intel-ia32-bin
 endif  endif
   
 ifdef _linux64onosx  ifdef _linux64onosx
 GCC=/usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-gcc  GCC=/usr/localold/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-gcc
 STRIP=/usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-strip  STRIP=/usr/localold/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-strip
 LFLAGS= -g  LFLAGS= -g
 CFLAGS= -g  CFLAGS= -g
   CROSSCOMPILATION= -DCROSS=1
 LFLAGSOPT= -O3 -lm -s  LFLAGSOPT= -O3 -lm -s
 CFLAGSOPT= -O3  CFLAGSOPT= -O3
   TAR= /sw/bin/gnutar
 UNIX2DOS= unix2dos  UNIX2DOS= unix2dos
 SETUPCOMP= ~/bin/InnoSetup5Playonmac  SETUPCOMP= ~/bin/InnoSetup5Playonmac
 CP= cp  CP= cp
Line 178  endif Line 206  endif
 ifdef _linux32onosx  ifdef _linux32onosx
 #GCC=/usr/local/i386-mingw32-4.3.0/bin/i386-mingw32-gcc  #GCC=/usr/local/i386-mingw32-4.3.0/bin/i386-mingw32-gcc
 #GCC=/usr/local/cross-tools/bin/i686-w64-mingw32-gcc  #GCC=/usr/local/cross-tools/bin/i686-w64-mingw32-gcc
 GCC=/usr/local/gcc-4.8.1-for-linux32/bin/i586-pc-linux-gcc  GCC=/usr/localold/gcc-4.8.1-for-linux32/bin/i586-pc-linux-gcc
 STRIP=/usr/local/gcc-4.8.1-for-linux32/bin/i586-pc-linux-strip  STRIP=/usr/localold/gcc-4.8.1-for-linux32/bin/i586-pc-linux-strip
 LFLAGS= -g  LFLAGS= -g
 CFLAGS= -g  CFLAGS= -g
 LFLAGSOPT= -O3 -s -lm  LFLAGSOPT= -O3 -s -lm
 CFLAGSOPT= -O3  CFLAGSOPT= -O3
   CROSSCOMPILATION= -DCROSS=1
   TAR= /sw/bin/gnutar
 UNIX2DOS= unix2dos  UNIX2DOS= unix2dos
 SETUPCOMP= ~/bin/InnoSetup5Playonmac  SETUPCOMP= ~/bin/InnoSetup5Playonmac
 CP= cp  CP= cp
Line 192  endif Line 222  endif
   
 ifdef _linux  ifdef _linux
 #CFLAGS= -g -DUNIX -DDEBUGHESS  #CFLAGS= -g -DUNIX -DDEBUGHESS
 CFLAGS= -g -DDEBUG  #CFLAGS= -g -DDEBUG -DFIXMNBRAK
   #CFLAGS= -g -DDEBUG 
   CFLAGS= -g
 LFLAGS= -g -lm  LFLAGS= -g -lm
 IGSL= -I/usr/include/gsl  IGSL= -I/usr/include/gsl
 LGSL= -lgsl -lgslcblas  LGSL= -lgsl -lgslcblas
Line 200  INLOPT= -I/usr/local/include Line 232  INLOPT= -I/usr/local/include
 LNLOPT= -lm -L/usr/local/lib -lnlopt  LNLOPT= -lm -L/usr/local/lib -lnlopt
 CFLAGSOPT= -O3 -g  CFLAGSOPT= -O3 -g
 LFLAGSOPT= -O3 -g -lm  LFLAGSOPT= -O3 -g -lm
   CROSSCOMPILATION= -DCROSS=0
 UNIX2DOS= unix2dos  UNIX2DOS= unix2dos
 SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"  SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
 BINVERSION=LINUXnative  BINVERSION=LINUXnative
Line 216  TMPNOREGSETUPSCRIPT=noreg-setup.iss Line 249  TMPNOREGSETUPSCRIPT=noreg-setup.iss
 TMPSCRIPTIN=setup.iss.in  TMPSCRIPTIN=setup.iss.in
 APPLICATION=IMaCh  APPLICATION=IMaCh
 APPNAME=$(APPLICATION)-$(VERSION)  APPNAME=$(APPLICATION)-$(VERSION)
 GNUPLOTVERSION=4.0  APPCOMPILATIONMODE=$(IMACHSETUPVERSION)
   GNUPLOTVERSION=5.1
 LICENSE=Copying  LICENSE=Copying
 TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe  TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
 TMPNOREGSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-noreg-setup.exe  TMPNOREGSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-noreg-setup.exe
Line 228  setup.iss: setup.iss.in Line 262  setup.iss: setup.iss.in
                 s/@NOTINNOREG@//g; \                  s/@NOTINNOREG@//g; \
                 s/@NOREG@//g; \                  s/@NOREG@//g; \
                 s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \                  s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \
                   s/@APPCOMPILATIONMODE@/$(APPCOMPILATIONMODE)/g; \
                 s/@VERSION@/$(VERSION)/g; \                  s/@VERSION@/$(VERSION)/g; \
                 s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \                  s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
                 s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \                  s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
Line 257  $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN) Line 292  $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
 $(TMPSETUPEXE): $(TMPSETUPSCRIPT)  $(TMPSETUPEXE): $(TMPSETUPSCRIPT)
         $(SETUPCOMP) /cc $(TMPSETUPSCRIPT)          $(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
   
 $(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)  #$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)
         $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)  #       $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
   
 PARAM=mypar1  PARAM=mypar1
   
Line 276  imachcyg-noreg-setup: imachcygopt.exe no Line 311  imachcyg-noreg-setup: imachcygopt.exe no
         $(CP) imachcygopt.exe imach$(VERSION)-$(BINVERSION).exe          $(CP) imachcygopt.exe imach$(VERSION)-$(BINVERSION).exe
         $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)          $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
         cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup          cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup
   # ICL compiler 64
   imachICL-build: imach.c
           icl /GS /W3 /Zc:wchar_t /O2  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /Qipo /Zc:forScope  /MT imach.c 
   #/GS /W3 /Gy /Zc:wchar_t /Zi /O2 /Fd"x64\Release\vc120.pdb" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_LIB" /D "_UNICODE" /D "UNICODE" /Qipo /Zc:forScope /Oi /MT /Fa"x64\Release\" /EHsc /nologo /Fo"x64\Release\" /Qprof-dir "x64\Release\" /Fp"x64\Release\IMaCh-icl-x64-0.98q2.pch"
   #  /Users/nbrouard/Documents/imach/imach-gui/build/icl64/Release/imach.exe
   # both 32 and 64 executables should have been built on Windows with Intel compiler.
   
 imachILC64-setup: IMaCh-ilc64.exe setup.iss  imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat setup.iss 
           pwd
         touch setup.iss.in          touch setup.iss.in
         $(CP) IMaCh-ilc64.exe imach.exe  
         $(SETUPCOMP) /cc setup.iss          $(SETUPCOMP) /cc setup.iss
         $(CP) Output/$(TMPSETUPEXE) imachILC64-setup          $(CP) Output/$(TMPSETUPEXE) imachICL-setup
   
   # imachICL64-setup: IMaCh-icl64-$(VERSION).exe setup.iss
   #       pwd
   #       $(CP) IMaCh-icl64-$(VERSION).exe imach.exe
   #       $(SETUPCOMP) /cc setup.iss
   #       $(CP) Output/$(TMPSETUPEXE) imachICL64-setup
   
   imachICL64-noreg-setup: IMaCh-icl64-$(VERSION).exe noreg-setup.iss
           touch setup.iss.in
           $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
           $(CP) Output/$(TMPSETUPEXE) imachICL64-noreg-setup
   
   ../build/icl64/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl64.bat
           rm -rf ../build/icl64  && mkdir ../build/icl64
           cp ../distributions/windows/mybuildicl64.bat ../build/icl64/
           cd ../build/icl64
           VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
    --username brouard  --verbose --wait-exit --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
   
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR"
   
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR" 
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
   #VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
   #       --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
   
   ../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat
           rm -rf ../build/icl32 && mkdir -p ../build/icl32
           cp ../distributions/windows/mybuildicl32.bat ../build/icl32/
           cd ../build/icl32
           VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
     --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
   
   #VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
   # --username brouard  --verbose  --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
   
   ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat
           rm -rf ../build/vs32 && mkdir -p ../build/vs32
           cp mybuildvs32.bat ../build/vs32/
           cd ../build/vs32
           VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
           --username brouard  --verbose  --wait-stdout -- "/c" "g:\imach\imach-gui\build\vs32\mybuildvs32.bat" "$(VERSION)"
   # C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K "g:\imach\imach-gui\build\icl32\mybuild.bat"
   #WORK   --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "c:\users\brouard\mybuild.bat"
   #       --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g: && cd \imach\imach-gui\build\icl32 && mybuild.bat"
   #       --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g: && cd \imach\imach-gui\build\icl32-xp  &&" "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd.bat" "&&" "C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" "ia32" "vs2013" "&&" "msbuild imach-0.98q3.vcxproj /t:Build /p:Configuration=Release"
   #       --username brouard --wait-exit --wait-stdout -- "/c" "g: && cd \imach\imach-gui\build\icl32-xp\ &&C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K ""C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" ia32 vs2013"&& msbuild imach.vcxproj >c:\users\brouard\totog.txt"
   #               --username brouard --wait-exit --wait-stdout -- "/c" "g: && dir >c:\users\brouard\totog.txt"
   #C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K ""C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" ia32 vs2013"
   #C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K ""C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" intel64 vs2013"
   
 imachILC64-noreg-setup: IMaCh-ilc64.exe noreg-setup.iss  imachICL64-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl64.bat
   
   imachICL32-setup: ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl32.bat
   
   imachVS32-setup: ../build/vs32/Release/IMaCh-$(VERSION).exe setup.iss mybuildvs32.bat
   
   imachICL32-noreg-setup: IMaCh-icl32.exe noreg-setup.iss
         touch setup.iss.in          touch setup.iss.in
         $(CP) IMaCh-ilc64.exe imach.exe          $(CP) IMaCh-icl32.exe imach.exe
         $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)          $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
         $(CP) Output/$(TMPSETUPEXE) imachILC64-noreg-setup          $(CP) Output/$(TMPSETUPEXE) imachICL32-noreg-setup
   
 imachMVC-setup: imachMVC.exe setup.iss  imachMVC-setup: imachMVC.exe setup.iss
         touch setup.iss.in          touch setup.iss.in
         $(CP) imachMVC.exe imach.exe          $(CP) imachMVC.exe imach.exe
         $(SETUPCOMP) /cc setup.iss          $(SETUPCOMP) /cc setup.iss
         $(CP) Output/$(TMPSETUPEXE) imachcyg-setup          $(CP) Output/$(TMPSETUPEXE) imachMVC-setup
   
 # imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)  # imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)
 imachMVC-noreg-setup: imachMVC.exe noreg-setup.iss  imachMVC-noreg-setup: imachMVC.exe noreg-setup.iss
Line 307  simach : simach.o Line 405  simach : simach.o
 simach.o : simach.c   simach.o : simach.c 
         $(CC) $(CFLAGS) -DGSL -c simach.c          $(CC) $(CFLAGS) -DGSL -c simach.c
   
 imach : imach.o   imachtest: imachtest.o 
           $(CC) $(LFLAGS) -o imachtest imachtest.o
   ifdef _macosx
           $(DSYMUTIL) imachtest
   endif
   
   imach: imach.o 
         $(CC) $(LFLAGS) -o imach imach.o          $(CC) $(LFLAGS) -o imach imach.o
 ifdef _macosx  ifdef _macosx
         $(DSYMUTIL) imach          $(DSYMUTIL) imach
 endif  endif
   
 imach.o : imach.c   imach.o : imach.c 
          $(CC) $(CFLAGS) -DPOWELL -c imach.c           $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -c imach.c
   #        $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DDEBUGBRENT -c imach.c
   
   imachtest.o : imach.c 
            $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DPOWELLORIGINAL -DNRCORIGINAL -DINFINITYORIGINAL -DDEBUGBRENT -o imachtest.o -c imach.c
   
   #        $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -DFIXMNBRAK -o imachtest.o -c imach.c
   
 # http://msdn.microsoft.com/en-us/library/abx4dbyh%28v=vs.100%29.aspx  # http://msdn.microsoft.com/en-us/library/abx4dbyh%28v=vs.100%29.aspx
 imachcl: imach.c  imachcl: imach.c
Line 359  ifdef _macosx Line 469  ifdef _macosx
         $(STRIP) imach          $(STRIP) imach
 endif  endif
 ifdef _linux32onosx  ifdef _linux32onosx
         (cd .. && gnutar jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)          (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif  endif
 ifdef _linux64onosx  ifdef _linux64onosx
         (cd .. && gnutar jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)          (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif  endif
   
 imachopt.o : imach.c  imachopt.o : imach.c version.h
         $(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c          $(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c
 #       $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c  #       $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
   
 imachUB : imach32 imach64  imachUB : imach32 imach64
         lipo -create -arch i386 imach_32 -arch x86_64 imach_64 -output imach$(VERSION)          lipo -create -arch i386 imach_32 -arch x86_64 imach_64 -output imach$(VERSION)
   
   imachrpm : imachopt.o 
           pwd
           (cd ../build && rm -r gnulinux && mkdir gnulinux && cd gnulinux ;\
           pwd ;\
           cmake ../..;\
           cmake --build . ; \
           echo $(OSTYPE);\
           cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM;\
           cp  imach$(VERSION)-*.rpm ../../src/Output/ ;)
   
 #imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf  #imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf
 imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf  #       $(CC) $(LFLAGSOPT) -o imach imachopt.o
         $(CC) $(LFLAGSOPT) -o imach imachopt.o  
         #hdiutil detach /Volumes/IMaCh\ $(VERSION)          #hdiutil detach /Volumes/IMaCh\ $(VERSION)
         rm -rf imach$(VERSION).app  #       cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
         mkdir -p imach$(VERSION).app  
         mkdir -p imach$(VERSION).app/Contents  imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/createdmg3.sh ../distributions/osx/applet ../distributions/osx/IMaChInfo.plist.in ../distributions/osx/IMaChPkgInfo.in ../distributions/osx/IMaCh.icns ../distributions/osx/main.scpt.in ../distributions/osx/IMaCh-ecrandemarrage.rsrc ../distributions/osx/TXT.rtf
         mkdir -p imach$(VERSION).app/Contents/MacOS          pwd
         cp applet imach$(VERSION).app/Contents/MacOS          (cd ../build && rm -r osx && mkdir osx && cd osx ;\
         mkdir -p imach$(VERSION).app/Contents/Resources          pwd ;\
         mkdir -p imach$(VERSION).app/Contents/Resources/Scripts          cmake ../..;\
         mkdir -p imach$(VERSION).app/Contents/Resources/bin          cmake --build . ; \
         mkdir -p imach$(VERSION).app/Contents/Resources/html          echo $(OSTYPE);\
         cp imach imach$(VERSION).app/Contents/Resources/bin          rm -rf imach$(VERSION).app;\
         cp gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot          mkdir -p imach$(VERSION).app;\
         mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd          mkdir -p imach$(VERSION).app/Contents;\
         cp -p TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd          mkdir -p imach$(VERSION).app/Contents/MacOS;\
         $(SED) -e "s/@VERSION@/$(VERSION)/g;" \          cp ../../distributions/osx/applet imach$(VERSION).app/Contents/MacOS;\
         IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist          mkdir -p imach$(VERSION).app/Contents/Resources;\
         cp -p IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo          mkdir -p imach$(VERSION).app/Contents/Resources/Scripts;\
         cp -p IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns          mkdir -p imach$(VERSION).app/Contents/Resources/bin;\
         cp -r -p main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt          mkdir -p imach$(VERSION).app/Contents/Resources/lib;\
         cp IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc          mkdir -p imach$(VERSION).app/Contents/Resources/html;\
         cp ../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html          cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
         cp ../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html          cp ../../distributions/osx/gnuplot_bin/bin/gnuplot imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
         cp ../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html          cp ../../distributions/osx/gnuplot_bin/lib/* imach$(VERSION).app/Contents/Resources/lib;\
         rm -f imach$(VERSION).dmg          mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\
         ./createdmg3.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)          cp -p ../../distributions/osx/TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd ;\
         mv  imach$(VERSION).dmg Output/          $(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\
 #       ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app          cp -p ../../distributions/osx/IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo ;\
           cp -p ../../distributions/osx/IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns ;\
           cp -r -p ../../distributions/osx/main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt ;\
           cp ../../distributions/osx/IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc ;\
           cp ../../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html ;\
           cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html ;\
           cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html ;\
           rm -f imach$(VERSION).dmg ;\
           pwd ;\
           cp ../../distributions/osx/createdmg3.sh . ;\
           cp ../../distributions/osx/Background.png .;\
           pwd ;\
           ./createdmg3.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
           cp  imach$(VERSION).dmg ../../src/Output/ ;)
   #       ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app 
 #       ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)  #       ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
   
 upload:  md5:
         ls Output/* | xargs md5sum          ls Output/* | xargs md5sum
         rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/  upload:
           rsync -v Output/IMaCh-0.98r3-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
           rsync -v Output/imach0.98r3.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   #       rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   
 imachcyg : imachcyg.o  imachcyg : imachcyg.o
         $(CC) $(LFLAGS) -o imach imachcyg.o          $(CC) $(LFLAGS) -o imach imachcyg.o

Removed from v.1.50  
changed lines
  Added in v.1.77


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>