Summary: Brouard

With an other createdmg for OS/X

diff --git a/src/Makefile b/src/Makefile
index ec6c216441b27bc74c0c00ba8a680102a58f3631..afb577f0efd1fd9454e459ffcf22fa224dc394e2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.98nR
+VERSION=0.98nS
 COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)
 IMACHSETUPVERSION=1
 
@@ -23,7 +23,8 @@ IMACHSETUPVERSION=1
 # sortie dans Output/setup.exe
 # ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 4/Compil32.exe /usr/local/bin/Compil32
 ##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/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
 #CC= gcc -v
@@ -206,10 +207,28 @@ imachopt : imachopt.o
 imachopt.o : imach.c 
        $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
 
-imachdmg : imachopt.o create-dmg
+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
-       cp imach imach098Leopard/bin
-       ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach098Leopard
+       rm -rf imach$(VERSION).app
+       mkdir -p imach$(VERSION).app
+       mkdir -p imach$(VERSION).app/Contents
+       mkdir -p imach$(VERSION).app/Contents/MacOS
+       cp applet imach$(VERSION).app/Contents/MacOS
+       mkdir -p imach$(VERSION).app/Contents/Resources
+       mkdir -p imach$(VERSION).app/Contents/Resources/Scripts
+       mkdir -p imach$(VERSION).app/Contents/Resources/bin
+       cp imach imach$(VERSION).app/Contents/Resources/bin
+       mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd
+       cp -p TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd
+       $(SED) -e "s/@VERSION@/$(VERSION)/g;" \
+       IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist
+       cp -p IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo
+       cp -p IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns
+       cp -r -p main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt
+       cp IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc
+       rm -f imach$(VERSION).dmg
+       ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
+#      ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app
 
 
 imachcyg : imachcyg.o  strsep.o