Commit 1e8ffd2e authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge from legacy_0.2.8.3

parents 6c11339c d488dcfd
Pipeline #266622336 passed with stages
in 46 minutes and 40 seconds
......@@ -292,7 +292,7 @@ macOS/server_build.tag: context.64 #Makefile
cd macOS/server && ../../$<.dir/source/configure --disable-glout "${MACOS_CONFIG_ARGS}" && ${MAKE}
echo > $@
macOS/server.tag: macOS/server_build.tag upload/.tag #Makefile
macOS/server.tag: macOS/client.tag macOS/server_build.tag upload/.tag #Makefile
rm -rf macOS/server/*.app
cd macOS/server && bash ${MACOS_BUILD_BUNDLE}
cp macOS/server/*.dmg macOS/server/*.macOS.zip upload/
......@@ -303,7 +303,7 @@ macOS/steam_build.tag: context.steam #Makefile
cd macOS/steam && ../../$<.dir/source/configure "${MACOS_CONFIG_ARGS}" progname="${STEAM_PACKAGE_NAME}" progtitle="${STEAM_PACKAGE_TITLE}" && ${MAKE}
echo > $@
macOS/steam.tag: macOS/steam_build.tag upload/.tag #Makefile
macOS/steam.tag: macOS/server.tag macOS/steam_build.tag upload/.tag #Makefile
rm -rf macOS/steam/*.app
cd macOS/steam && bash ${MACOS_BUILD_BUNDLE}
cp macOS/steam/*.dmg macOS/steam/*.macOS.zip upload/
......@@ -857,10 +857,10 @@ intermediateclean:
# keep the artifacts clean of junk not needed in the next phase
artifactclean:
rm *.dir \
rm -rf \
*.dir \
proto/*.dir \
source \
-rf
source
clean: intermediateclean
rm -rf \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment