Skip to content

Commit 0e5daa0

Browse files
hgy29hgy29
committed
[scripts/mk] Full build work
1 parent e9b6bec commit 0e5daa0

File tree

4 files changed

+38
-15
lines changed

4 files changed

+38
-15
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,9 @@ moc_*.cpp
252252
*.dylib
253253
*.app
254254

255+
# MAC DS store
256+
.DS_Store
257+
255258
# some files and folder to include
256259
!/release
257260
!*.nsi

‎scripts/GidPkg.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ fetch.mac.pkg:
1414
echo "\
1515
cd $(MAC_PATH)/Build.Mac;\
1616
rm -f BuildMac.zip;\
17-
zip -r BuildMac.zip Players Templates All\\ Plugins;\
17+
zip -r BuildMac.zip Sdk Players Templates All\\ Plugins;\
1818
exit;\
1919
" | ssh $(MAC_HOST)
2020
scp -B $(MAC_HOST):$(MAC_PATH)/Build.Mac/BuildMac.zip $(RELEASE)/BuildMac.zip
2121

2222
push.mac.pkg:
2323
cd $(RELEASE);\
2424
rm -f BuildWin.zip;\
25-
zip -r BuildWin.zip Players Templates All\\ Plugins;\
25+
zip -r BuildWin.zip Sdk Players Templates All\\ Plugins;\
2626
scp -B BuildWin.zip $(MAC_HOST):$(MAC_PATH)/Build.Mac/BuildWin.zip
2727

2828
sync.mac.pkg: fetch.mac.pkg push.mac.pkg

‎scripts/GidQtMac.mk

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ qtlibs.install: buildqtlibs
3535

3636
%.plugin.install:
3737
mkdir -p $(RELEASE)/Plugins
38-
mkdir -p $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate/Plugins
38+
mkdir -p $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate/MacOSXDesktopTemplate.app/Contents/Plugins
3939
mkdir -p $(RELEASE)/All\ Plugins/$*/bin/MacOSX
40+
R=$(PWD); cd $(ROOT)/plugins/$*/source; if [ -d "Desktop" ]; then cd Desktop; fi; rm -f *.1.dylib *.1.0.dylib *.1.0.0.dylib
4041
R=$(PWD); cd $(ROOT)/plugins/$*/source; if [ -d "Desktop" ]; then cd Desktop; fi; cp *.dylib $$R/$(RELEASE)/Plugins
41-
R=$(PWD); cd $(ROOT)/plugins/$*/source; if [ -d "Desktop" ]; then cd Desktop; fi; cp *.dylib $$R/$(RELEASE)/Templates/Qt/MacOSXDesktopTemplate/Plugins
42+
R=$(PWD); cd $(ROOT)/plugins/$*/source; if [ -d "Desktop" ]; then cd Desktop; fi; cp *.dylib $$R/$(RELEASE)/Templates/Qt/MacOSXDesktopTemplate/MacOSXDesktopTemplate.app/Contents/Plugins
4243
R=$(PWD); cd $(ROOT)/plugins/$*/source; if [ -d "Desktop" ]; then cd Desktop; fi; cp *.dylib $$R/$(RELEASE)/All\ Plugins/$*/bin/MacOSX
4344

4445
qtlibs.clean: $(addsuffix .qmake.clean,libpystring libgvfs libgid lua libgideros)
@@ -54,8 +55,10 @@ qt.install: buildqt qt.player
5455
$(DEPLOYQT) $(RELEASE)/Gideros\ Studio.app
5556
cp $(QT)/lib/libqscintilla2.11.dylib $(RELEASE)/Gideros\ Studio.app/Contents/Frameworks/
5657
cp -R $(ROOT)/ui/Resources $(RELEASE)/Gideros\ Studio.app/Contents/
57-
cp -R $(ROOT)/ui/Tools $(RELEASE)/Gideros\ Studio.app/Contents/Tools
58-
for t in gdrdeamon gdrbridge gdrexport; do cp $(ROOT)/$$t/$$t $(RELEASE)/Gideros\ Studio.app/Contents/Tools; done
58+
cp -R $(ROOT)/ui/Tools $(RELEASE)/Gideros\ Studio.app/Contents/Tools
59+
for t in gdrdeamon gdrbridge gdrexport; do \
60+
install_name_tool -add_rpath @executable_path/../Frameworks $(ROOT)/$$t/$$t;\
61+
cp $(ROOT)/$$t/$$t $(RELEASE)/Gideros\ Studio.app/Contents/Tools; done
5962
#PLAYER
6063
rm -rf $(RELEASE)/Gideros\ Player.app
6164
cp -R $(ROOT)/player/Gideros\ Player.app $(RELEASE)
@@ -90,16 +93,16 @@ qt.install: buildqt qt.player
9093
mkdir -p $(RELEASE)/Templates/Xcode4/iOS\ Template/iOS\ Template/assets
9194
mkdir -p $(RELEASE)/Examples
9295
cp -R $(ROOT)/samplecode/* $(RELEASE)/Examples
93-
cp -R $(ROOT)/ios/GiderosiOSPlayer $(RELEASE)
9496

9597

9698
QTDLLEXT?=
9799

98100
qt.player:
99101
mkdir -p $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate
100102
cp -R $(ROOT)/desktop/MacOSXDesktopTemplate.app $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate
101-
cp -R $(ROOT)/desktop/Entitlements.plist $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate
102-
$(DEPLOYQT) $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate/MacOSXDesktopTemplate.app
103+
cp -R $(ROOT)/desktop/Entitlements.plist $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate
104+
cp -R $(ROOT)/desktop/Entitlements.plist $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate/MacOSXDesktopTemplate.app/Contents/
105+
$(DEPLOYQT) $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate/MacOSXDesktopTemplate.app/
103106
cp $(SDK)/lib/desktop/*.1.dylib $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate/MacOSXDesktopTemplate.app/Contents/Frameworks/
104107
cp libpystring/libpystring.1.dylib $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate/MacOSXDesktopTemplate.app/Contents/Frameworks/
105108
install_name_tool -change libgvfs.1.dylib @rpath/libgvfs.1.dylib $(RELEASE)/Templates/Qt/MacOSXDesktopTemplate/MacOSXDesktopTemplate.app/Contents/Frameworks/libgid.1.dylib
@@ -137,4 +140,19 @@ tools:
137140
linit lbaselib ldblib liolib lmathlib loslib ltablib lstrlib loadlib)
138141

139142
bundle:
140-
mv $(RELEASE)/Templates $(RELEASE)/Gideros\ Studio.app/Contents
143+
rm -rf $(RELEASE).Tmp
144+
mkdir -p $(RELEASE).Tmp
145+
rm -rf $(RELEASE).Final
146+
mkdir -p $(RELEASE).Final
147+
mv $(RELEASE)/*.zip $(RELEASE).Tmp
148+
cp -R $(RELEASE)/* $(RELEASE).Final
149+
mv $(RELEASE).Tmp/* $(RELEASE)
150+
rm -rf $(RELEASE).Tmp
151+
cd $(RELEASE).Final; if [ -f ../$(notdir $(RELEASE))/BuildMac.zip ]; then unzip -o ../$(notdir $(RELEASE))/BuildMac.zip; fi
152+
cd plugins; git archive master | tar -x -C ../$(RELEASE).Final/All\ Plugins
153+
-wget --recursive --no-clobber --page-requisites --html-extension --convert-links --restrict-file-names=windows --domains docs.giderosmobile.com --no-parent http://docs.giderosmobile.com/
154+
rm -rf $(RELEASE).Final/Documentation
155+
cp -R docs.giderosmobile.com $(RELEASE).Final/Documentation
156+
mv $(RELEASE).Final/Templates $(RELEASE).Final/Gideros\ Studio.app/Contents
157+
-wget "http://docs.giderosmobile.com/reference/autocomplete.php" -O $(RELEASE).Final/Gideros\ Studio.app/Contents/Resources/gideros_annot.api
158+

‎scripts/GidQtWin.mk

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ qt.install: buildqt qt5.install qt.player
5656
cp $(ROOT)/texturepacker/release/GiderosTexturePacker.exe $(RELEASE)
5757
cp $(ROOT)/fontcreator/release/GiderosFontCreator.exe $(RELEASE)
5858
cp -R $(ROOT)/ui/Resources $(RELEASE)
59-
cp -R $(ROOT)/ui/Tools $(RELEASE)
59+
cd $(ROOT)/ui/;tar cf - --exclude=Tools/lua --exclude Tools/luac --exclude Tools/make Tools | (cd ../$(RELEASE) && tar xvf - )
6060
mkdir -p $(RELEASE)/Templates
6161
#Other templates
6262
cp -R $(ROOT)/ui/Templates/*.gexport $(RELEASE)/Templates
@@ -72,14 +72,13 @@ qt.install: buildqt qt5.install qt.player
7272
mkdir -p $(RELEASE)/Templates/Xcode4/iOS\ Template/iOS\ Template/assets
7373
mkdir -p $(RELEASE)/Examples
7474
cp -R $(ROOT)/samplecode/* $(RELEASE)/Examples
75-
cp -R $(ROOT)/ios/GiderosiOSPlayer $(RELEASE)
7675
cp $(ROOT)/gdrdeamon/release/gdrdeamon.exe $(RELEASE)/Tools
7776
cp $(ROOT)/gdrbridge/release/gdrbridge.exe $(RELEASE)/Tools
7877
cp $(ROOT)/gdrexport/release/gdrexport.exe $(RELEASE)/Tools
7978

8079
QT5DLLS=icudt$(QT5ICUVER) icuin$(QT5ICUVER) icuuc$(QT5ICUVER) libgcc_s_dw2-1 libstdc++-6 libwinpthread-1 \
8180
Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Xml \
82-
Qt5Multimedia Qt5MultimediaQuick_p QT5MultimediaWidgets
81+
Qt5Multimedia Qt5MultimediaQuick_p Qt5MultimediaWidgets
8382
QT5DLLTOOLS=icudt$(QT5ICUVER) icuin$(QT5ICUVER) icuuc$(QT5ICUVER) libgcc_s_dw2-1 libstdc++-6 libwinpthread-1 \
8483
Qt5Core Qt5Network Qt5Xml
8584
QT5PLATFORM=qminimal qoffscreen qwindows
@@ -157,5 +156,8 @@ bundle:
157156
rm -rf $(RELEASE).Tmp
158157
cd $(RELEASE).Final; if [ -f ../$(notdir $(RELEASE))/BuildMac.zip ]; then unzip -o ../$(notdir $(RELEASE))/BuildMac.zip; fi
159158
cd plugins; git archive master | tar -x -C ../$(RELEASE).Final/All\ Plugins
160-
161-
159+
-wget --recursive --no-clobber --page-requisites --html-extension --convert-links --restrict-file-names=windows --domains docs.giderosmobile.com --no-parent http://docs.giderosmobile.com/
160+
rm -rf $(RELEASE).Final/Documentation
161+
cp -R docs.giderosmobile.com $(RELEASE).Final/Documentation
162+
-wget "http://docs.giderosmobile.com/reference/autocomplete.php" -O $(RELEASE).Final/Resources/gideros_annot.api
163+

0 commit comments

Comments
 (0)