Makefile OSX

diff --git a/src/Makefile b/src/Makefile
index 2dfbba64b2450bf5280fa3a3c818dc91a2e2eb5c..5d18c921d45163f869cd4c90c63fb8b693d6a495 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -30,8 +30,8 @@ CCOPT=$(GCCOPT)
 #GCC= gcc
 
 ifdef _macosx
-GCC= gcc-11
-GCCOPT= gcc
+GCC= clang
+GCCOPT= clang
 # Mac OS/X version
 LFLAGS= -g -lm 
 #CFLAGS= -g -DDEBUG 
@@ -212,7 +212,10 @@ imachsrcrpm : imachopt.o ChangeLog
 
 imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/createdmg4.sh ../distributions/osx/IMaChInfo.plist.in ../distributions/osx/IMaChPkgInfo.in ../distributions/osx/IMaCh.icns  ../distributions/osx/TXT.rtf
        pwd
-       (cd ../build && rm -r osx && mkdir osx && cd osx ;\
+       LANG=C git log --date=format:"%a %b %d %Y" --pretty="tformat:* %ad %an <%ae> (%h)%n- %s%b%n" >ChangeLog
+       pwd
+       mkdir -p ../build && mkdir -p ../build/Output
+       (cd ../build && rm -rf osx && mkdir osx && cd osx ;\
        pwd ;\
        cmake ../..;\
        cmake --build . ; \
@@ -232,8 +235,6 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
        cp ../../distributions/osx/imach.sh imach$(VERSION).app/Contents/MacOS;\
        cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
        cp ../../distributions/osx/imach-run.sh imach$(VERSION).app/Contents/Resources/bin;\
-       cp ../../distributions/osx/gnuplot_bin/bin/gnuplot imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
-       cp ../../distributions/osx/gnuplot_bin/lib/* imach$(VERSION).app/Contents/Resources/lib;\
        mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\
        cp -p ../../distributions/osx/TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd ;\
        $(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\
@@ -243,6 +244,7 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
        cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/doc ;\
        cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/doc ;\
        cp ../../src/README.txt  imach$(VERSION).app/Contents/Resources/doc ;\
+       cp ../../src/ChangeLog  imach$(VERSION).app/Contents/Resources/doc ;\
        cp ../../tests/testV1V2.imach  imach$(VERSION).app/Contents/Resources/tests ;\
        cp ../../tests/rtestV1V2.imach  imach$(VERSION).app/Contents/Resources/tests ;\
        cp ../../tests/testV2.imach  imach$(VERSION).app/Contents/Resources/tests ;\
@@ -254,15 +256,15 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
        cp ../../distributions/osx/Background.png .;\
        pwd ;\
        ./createdmg4.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
-       cp  imach$(VERSION).dmg ../../src/Output/ ;)
+       cp  imach$(VERSION).dmg ../Output/ ;)
 #      ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app 
 #      ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
 
 md5:
        ls ../build/Output/* | xargs md5sum
 upload:
-       rsync -v ../build/Output/imach-0.99s6-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v ../build/Output/imach0.99s6.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v ../build/Output/imach-0.99s8-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v ../build/Output/imach0.99s8.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 
 $(PARAM).htm: imach $(PARAM).imach data1.txt
        ./imach $(PARAM).imach