Skip to content

Commit 56f22bf

Browse files
committedDec 5, 2018
Gradle now copy most of assets
It depends on cleanAssets, ensuring they are always fresh
1 parent 8cc75c0 commit 56f22bf

File tree

2 files changed

+45
-26
lines changed

2 files changed

+45
-26
lines changed
 

Diff for: ‎build/android/Makefile

+1-24
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ ANDR_ROOT = $(shell pwd)
1313
PROJ_ROOT = $(shell realpath $(ANDR_ROOT)/../..)
1414
APP_ROOT = $(ANDR_ROOT)/src/main
1515

16-
GAMES_TO_COPY = minetest_game
17-
MODS_TO_COPY =
18-
19-
2016
VERSION_MAJOR := $(shell cat $(PROJ_ROOT)/CMakeLists.txt | \
2117
grep ^set\(VERSION_MAJOR\ | sed 's/)/ /' | cut -f2 -d' ')
2218
VERSION_MINOR := $(shell cat $(PROJ_ROOT)/CMakeLists.txt | \
@@ -732,26 +728,7 @@ assets : $(ASSETS_TIMESTAMP)
732728
if [ $$REFRESH -ne 0 ] ; then \
733729
echo "assets changed, refreshing..."; \
734730
$(MAKE) clean_assets; \
735-
mkdir -p ${APP_ROOT}/assets/Minetest; \
736-
cp ${PROJ_ROOT}/minetest.conf.example ${APP_ROOT}/assets/Minetest; \
737-
cp ${PROJ_ROOT}/README.md ${APP_ROOT}/assets/Minetest; \
738-
cp -r ${PROJ_ROOT}/builtin ${APP_ROOT}/assets/Minetest; \
739-
mkdir -p ${APP_ROOT}/assets/Minetest/client; \
740-
cp -r ${PROJ_ROOT}/client/shaders ${APP_ROOT}/assets/Minetest/client; \
741-
cp ${PROJ_ROOT}/doc/lgpl-2.1.txt ${APP_ROOT}/assets/Minetest/LICENSE.txt; \
742-
mkdir -p ${APP_ROOT}/assets/Minetest/fonts; \
743-
cp -r ${PROJ_ROOT}/fonts/*.ttf ${APP_ROOT}/assets/Minetest/fonts/; \
744-
mkdir -p ${APP_ROOT}/assets/Minetest/games; \
745-
for game in ${GAMES_TO_COPY}; do \
746-
cp -r ${PROJ_ROOT}/games/$$game ${APP_ROOT}/assets/Minetest/games/; \
747-
done; \
748-
mkdir -p ${APP_ROOT}/assets/Minetest/mods; \
749-
for mod in ${MODS_TO_COPY}; do \
750-
cp -r ${PROJ_ROOT}/mods/$$mod ${APP_ROOT}/assets/Minetest/mods/; \
751-
done; \
752-
cp -r ${PROJ_ROOT}/po ${APP_ROOT}/assets/Minetest; \
753-
cp -r ${PROJ_ROOT}/textures ${APP_ROOT}/assets/Minetest; \
754-
mkdir -p ${APP_ROOT}/assets/Minetest/media; \
731+
./gradlew copyAssets; \
755732
cp -r ${IRRLICHT_DIR}/media/Shaders ${APP_ROOT}/assets/Minetest/media; \
756733
cd ${APP_ROOT}/assets || exit 1; \
757734
find . -name "timestamp" -exec rm {} \; ; \

Diff for: ‎build/android/build.gradle

+44-2
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,48 @@ task cleanAssets(type: Delete) {
7272
delete 'src/main/assets'
7373
}
7474

75+
task copyAssets {
76+
dependsOn 'cleanAssets'
77+
mkdir "src/main/assets"
78+
79+
def mtAssetsFolder = "src/main/assets/Minetest"
80+
def projRoot = "../.."
81+
def gameToCopy = "minetest_game"
82+
83+
doLast {
84+
mkdir "${mtAssetsFolder}"
85+
mkdir "${mtAssetsFolder}/client"
86+
mkdir "${mtAssetsFolder}/fonts"
87+
mkdir "${mtAssetsFolder}/games"
88+
mkdir "${mtAssetsFolder}/media"
89+
90+
copy {
91+
from "${projRoot}/minetest.conf.example", "${projRoot}/README.md" into mtAssetsFolder
92+
}
93+
copy {
94+
from "${projRoot}/doc/lgpl-2.1.txt" into "${mtAssetsFolder}/LICENSE.txt"
95+
}
96+
copy {
97+
from "${projRoot}/builtin" into "${mtAssetsFolder}/builtin"
98+
}
99+
copy {
100+
from "${projRoot}/client/shaders" into "${mtAssetsFolder}/client/shaders"
101+
}
102+
copy {
103+
from "${projRoot}/fonts" include "*.ttf" into "${mtAssetsFolder}/fonts"
104+
}
105+
copy {
106+
from "${projRoot}/games/${gameToCopy}" into "${mtAssetsFolder}/games/${gameToCopy}"
107+
}
108+
copy {
109+
from "${projRoot}/po" into "${mtAssetsFolder}/po"
110+
}
111+
copy {
112+
from "${projRoot}/textures" into "${mtAssetsFolder}/textures"
113+
}
114+
}
115+
}
116+
75117
task cleanIconv(type: Delete) {
76118
delete 'deps/libiconv'
77119
}
@@ -118,8 +160,8 @@ task cleanGMP(type: Delete) {
118160
}
119161

120162
task cleanAll(type: Delete, dependsOn: [clean, cleanAssets, cleanIconv,
121-
cleanFreetype, cleanIrrlicht, cleanLevelDB, cleanSQLite3, cleanCURL,
122-
cleanOpenSSL, cleanOpenAL, cleanOgg, cleanGMP]) {
163+
cleanFreetype, cleanIrrlicht, cleanLevelDB, cleanSQLite3, cleanCURL,
164+
cleanOpenSSL, cleanOpenAL, cleanOgg, cleanGMP]) {
123165
delete 'deps'
124166
delete 'gen'
125167
delete 'libs'

0 commit comments

Comments
 (0)