Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Code Issues Projects Releases Wiki Activity

refactor steam pipe generation

Browse Source
This commit is contained in:
tobspr 2022-06-06 15:28:30 +02:00
parent 691911104e
commit b821c7259c
26 changed files with 185 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -59,3 +59,5 @@ config.local.js
app.vdf
steamtmp
build_output
built_vdfs

86
gulp/gulpfile.js
View File

@ -200,8 +200,6 @@ function serveHTML({ version = "web-dev" }) {
gulp.series("js." + version + ".dev.watch")(() => true);
}
///////////////////// RUNNABLE TASKS /////////////////////
// Pre and postbuild
gulp.task("step.baseResources", gulp.series("imgres.allOptimized"));
gulp.task("step.deleteEmpty", cb => {
@ -211,7 +209,9 @@ gulp.task("step.deleteEmpty", cb => {
gulp.task("step.postbuild", gulp.series("imgres.cleanupUnusedCssInlineImages", "step.deleteEmpty"));
// // Builds everything (dev)
///////////////////// RUNNABLE TASKS /////////////////////
// Builds everything (dev)
gulp.task(
"build.prepare.dev",
gulp.series(
@ -229,29 +229,12 @@ gulp.task(
)
);
// // Builds everything (staging)
// gulp.task("step.staging.code", gulp.series("sounds.fullbuild", "translations.fullBuild", "js.staging"));
// gulp.task(
// "step.staging.mainbuild",
// gulp.parallel("utils.copyAdditionalBuildFiles", "step.baseResources", "step.staging.code")
// );
// gulp.task("step.staging.all", gulp.series("step.staging.mainbuild", "css.prod", "html.staging"));
// gulp.task("build.staging", gulp.series("utils.cleanup", "step.staging.all", "step.postbuild"));
// // Builds everything (prod)
// gulp.task("step.prod.code", gulp.series("sounds.fullbuild", "translations.fullBuild", "js.prod"));
// gulp.task(
// "step.prod.mainbuild",
// gulp.parallel("utils.copyAdditionalBuildFiles", "step.baseResources", "step.prod.code")
// );
// gulp.task("step.prod.all", gulp.series("step.prod.mainbuild", "css.prod", "html.prod"));
// gulp.task("build.prod", gulp.series("utils.cleanup", "step.prod.all", "step.postbuild"));
// Builds everything for every variant
for (const variant in BUILD_VARIANTS) {
const data = BUILD_VARIANTS[variant];
const buildName = "build." + variant;
// build
gulp.task(
buildName + ".code",
gulp.series(
@ -270,6 +253,18 @@ for (const variant in BUILD_VARIANTS) {
gulp.task(buildName, gulp.series("utils.cleanup", buildName + ".all", "step.postbuild"));
// bundle
if (data.standalone) {
gulp.task(
"bundle." + variant + ".from-windows",
gulp.series(buildName, "standalone." + variant + ".build-from-windows")
);
gulp.task(
"bundle." + variant + ".from-darwin",
gulp.series(buildName, "standalone." + variant + ".build-from-darwin")
);
}
// serve
gulp.task(
"serve." + variant,
@ -277,16 +272,6 @@ for (const variant in BUILD_VARIANTS) {
);
}
// OS X build and release upload
// gulp.task(
// "build.darwin64-prod",
// gulp.series(
// "build.standalone-prod",
// "standalone.prepare",
// "standalone.package.prod.darwin64.signManually"
// )
// );
// Deploying!
gulp.task(
"deploy.staging",
@ -297,23 +282,26 @@ gulp.task(
gulp.series("utils.requireCleanWorkingTree", "build.web-shapezio", "ftp.upload.prod")
);
// // china
// gulp.task(
// "china.main.standalone",
// gulp.series("china.build.standalone-prod", "china.standalone.package.prod")
// );
// // wegame
// gulp.task(
// "wegame.main.standalone",
// gulp.series("wegame.build.standalone-prod", "wegame.standalone.package.prod")
// );
// // all (except wegame)
// gulp.task("standalone.steam", gulp.series("regular.main.standalone", "china.main.standalone"));
// gulp.task(
// "standalone.all",
// gulp.series("regular.main.standalone", "china.main.standalone", "wegame.main.standalone")
// );
// Bundling (pre upload)
gulp.task(
"bundle.steam.from-darwin",
gulp.series("bundle.standalone-steam.from-darwin", "bundle.standalone-steam-china.from-darwin")
);
gulp.task(
"bundle.steam.from-windows",
gulp.series("bundle.standalone-steam.from-windows", "bundle.standalone-steam-china.from-windows")
);
gulp.task(
"bundle.steam-demo.from-darwin",
gulp.series("bundle.standalone-steam-demo.from-darwin", "bundle.standalone-steam-china-demo.from-darwin")
);
gulp.task(
"bundle.steam-demo.from-windows",
gulp.series(
"bundle.standalone-steam-demo.from-windows",
"bundle.standalone-steam-china-demo.from-windows"
)
);
// Default task (dev, localhost)
gulp.task("default", gulp.series("serve.web-localhost"));

80
gulp/standalone.js
View File

@ -119,7 +119,7 @@ function gulptasksStandalone($, gulp) {
asar: asar,
executableName: "shapezio",
icon: path.join(electronBaseDir, "favicon"),
name: "shapez-" + variant,
name: "shapez",
out: tempDestDir,
overwrite: true,
appBundleId: "tobspr.shapezio." + variant,
@ -175,7 +175,7 @@ function gulptasksStandalone($, gulp) {
fs.writeFileSync(
path.join(
appPath,
"shapez.io-standalone.app",
"shapez.app",
"Contents",
"MacOS",
"steam_appid.txt"
@ -202,14 +202,14 @@ function gulptasksStandalone($, gulp) {
"darwin",
"x64",
() => {
const appFile = path.join(tempDestDir, "shapez.io-standalone-darwin-x64");
const appFileInner = path.join(appFile, "shapez.io-standalone.app");
const appFile = path.join(tempDestDir, "shapez-darwin-x64");
const appFileInner = path.join(appFile, "shapez.app");
const appIdDest = path.join(
path.join(appFileInner, "Contents", "MacOS"),
"steam_appid.txt"
);
console.warn("++ Preparing ++");
fse.copySync(path.join(tempDestBuildDir, "steam_appid.txt"), appIdDest);
// console.warn("++ Preparing ++");
// fse.copySync(path.join(tempDestBuildDir, "steam_appid.txt"), appIdDest);
console.warn("++ Signing ++");
console.warn("Signing steam_appid.txt");
@ -241,17 +241,14 @@ function gulptasksStandalone($, gulp) {
};
},
}).then(() => {
execSync(
`codesign --verify --verbose ${path.join(appFile, "shapez.io-standalone.app")}`,
{
cwd: appFile,
}
);
execSync(`codesign --verify --verbose ${path.join(appFile, "shapez.app")}`, {
cwd: appFile,
});
console.warn("++ Notarizing ++");
electronNotarize
.notarize({
appPath: path.join(appFile, "shapez.io-standalone.app"),
appPath: path.join(appFile, "shapez.app"),
tool: "legacy",
appBundleId: "tobspr.shapezio.standalone",
@ -289,22 +286,53 @@ function gulptasksStandalone($, gulp) {
const hash = buildutils.getRevision();
const version = buildutils.getVersion();
for (const platform of ["steampipe", "steampipe-darwin"]) {
const steampipeDir = path.join(__dirname, platform, "scripts");
for (const buildVariant of ["app", "app-demo"]) {
const templateContents = fs
.readFileSync(path.join(steampipeDir, buildVariant + ".vdf.template"), {
encoding: "utf-8",
})
.toString();
// for (const platform of ["steampipe", "steampipe-darwin"]) {
const templatesSource = path.join(__dirname, "steampipe", "templates");
const templatesDest = path.join(__dirname, "steampipe", "built_vdfs");
const convertedContents = templateContents.replace(
"$DESC$",
platform + " " + buildVariant + " version " + version + ", commit " + hash
);
fs.writeFileSync(path.join(steampipeDir, buildVariant + ".vdf"), convertedContents);
const variables = {
PROJECT_DIR: path.resolve(path.join(__dirname, "..")).replace(/\\/g, "/"),
BUNDLE_DIR: path.resolve(path.join(__dirname, "..", "build_output")).replace(/\\/g, "/"),
TMP_DIR: path.resolve(path.join(__dirname, "steampipe", "tmp")).replace(/\\/g, "/"),
// BUILD_DESC: "v" + version + " @ " + hash,
VDF_DIR: path.resolve(path.join(__dirname, "steampipe", "built_vdfs")).replace(/\\/g, "/"),
};
const files = fs.readdirSync(templatesSource);
for (const file of files) {
if (!file.endsWith(".vdf")) {
continue;
}
variables.BUILD_DESC = file.replace(".vdf", "") + " - v" + version + " @ " + hash;
let content = fs.readFileSync(path.join(templatesSource, file)).toString("utf-8");
content = content.replace(/\$([^$]+)\$/gi, (_, variable) => {
if (!variables[variable]) {
throw new Error("Unknown variable " + variable + " in " + file);
}
return variables[variable];
});
fs.writeFileSync(path.join(templatesDest, file), content, { encoding: "utf8" });
}
// for (const buildVariant of ["app", "app-demo"]) {
// const templateContents = fs
// .readFileSync(path.join(steampipeDir, buildVariant + ".vdf.template"), {
// encoding: "utf-8",
// })
// .toString();
// const convertedContents = templateContents.replace(
// "$DESC$",
// platform + " " + buildVariant + " version " + version + ", commit " + hash
// );
// fs.writeFileSync(path.join(steampipeDir, buildVariant + ".vdf"), convertedContents);
// }
// }
cb();
});
}

14
gulp/steampipe-darwin/scripts/app-demo.vdf.template
View File

@ -1,14 +0,0 @@
"appbuild"
{
"appid" "1930750"
"desc" "$DESC$"
"buildoutput" "$STEAMPIPE_DIR$/steamtmp"
"contentroot" ""
"setlive" ""
"preview" "0"
"local" ""
"depots"
{
"1930756" "$STEAMPIPE_DIR$/scripts/demo-darwin.vdf"
}
}

14
gulp/steampipe-darwin/scripts/app.vdf.template
View File

@ -1,14 +0,0 @@
"appbuild"
{
"appid" "1318690"
"desc" "$DESC$"
"buildoutput" "$PROJECT_DIR$/gulp/steampipe-darwin/steamtmp"
"contentroot" ""
"setlive" ""
"preview" "0"
"local" ""
"depots"
{
"1318693" "$PROJECT_DIR$/gulp/steampipe-darwin/scripts/darwin.vdf"
}
}

17
gulp/steampipe/scripts/app-demo.vdf.template
View File

@ -1,17 +0,0 @@
"appbuild"
{
"appid" "1930750"
"desc" "$DESC$"
"buildoutput" "$STEAMPIPE_DIR$\steamtemp"
"contentroot" ""
"setlive" ""
"preview" "0"
"local" ""
"depots"
{
"1930753" "$STEAMPIPE_DIR$\scripts\demo-windows.vdf"
"1930754" "$STEAMPIPE_DIR$\scripts\demo-china-windows.vdf"
"1930752" "$STEAMPIPE_DIR$\scripts\demo-linux.vdf"
"1930755" "$STEAMPIPE_DIR$\scripts\demo-china-linux.vdf"
}
}

17
gulp/steampipe/scripts/app.vdf.template
View File

@ -1,17 +0,0 @@
"appbuild"
{
"appid" "1318690"
"desc" "$DESC$"
"buildoutput" "$STEAMPIPE_DIR$\steamtemp"
"contentroot" ""
"setlive" ""
"preview" "0"
"local" ""
"depots"
{
"1318691" "$STEAMPIPE_DIR$\scripts\windows.vdf"
"1318694" "$STEAMPIPE_DIR$\scripts\china-windows.vdf"
"1318692" "$STEAMPIPE_DIR$\scripts\linux.vdf"
"1318695" "$STEAMPIPE_DIR$\scripts\china-linux.vdf"
}
}

14
gulp/steampipe/templates/app-darwin-demo.vdf Normal file
View File

@ -0,0 +1,14 @@
"appbuild"
{
"appid" "1930750"
"desc" "$BUILD_DESC$"
"buildoutput" "$TMP_DIR$"
"contentroot" ""
"setlive" ""
"preview" "0"
"local" ""
"depots"
{
"1930756" "$VDF_DIR$/demo-darwin.vdf"
}
}

14
gulp/steampipe/templates/app-darwin.vdf Normal file
View File

@ -0,0 +1,14 @@
"appbuild"
{
"appid" "1318690"
"desc" "$BUILD_DESC$"
"buildoutput" "$TMP_DIR$"
"contentroot" ""
"setlive" ""
"preview" "0"
"local" ""
"depots"
{
"1318693" "$VDF_DIR$/standalone-darwin.vdf"
}
}

17
gulp/steampipe/templates/app-winlinux-demo.vdf Normal file
View File

@ -0,0 +1,17 @@
"appbuild"
{
"appid" "1930750"
"desc" "$BUILD_DESC$"
"buildoutput" "$TMP_DIR$"
"contentroot" ""
"setlive" ""
"preview" "0"
"local" ""
"depots"
{
"1930753" "$VDF_DIR$/demo-windows.vdf"
"1930754" "$VDF_DIR$/demo-china-windows.vdf"
"1930752" "$VDF_DIR$/demo-linux.vdf"
"1930755" "$VDF_DIR$/demo-china-linux.vdf"
}
}

17
gulp/steampipe/templates/app-winlinux.vdf Normal file
View File

@ -0,0 +1,17 @@
"appbuild"
{
"appid" "1318690"
"desc" "$BUILD_DESC$"
"buildoutput" "$TMP_DIR$"
"contentroot" ""
"setlive" ""
"preview" "0"
"local" ""
"depots"
{
"1318691" "$VDF_DIR$\standalone-windows.vdf"
"1318694" "$VDF_DIR$\standalone-china-windows.vdf"
"1318692" "$VDF_DIR$\standalone-linux.vdf"
"1318695" "$VDF_DIR$\standalone-china-linux.vdf"
}
}

2
gulp/steampipe/scripts/demo-china-linux.vdf → gulp/steampipe/templates/demo-china-linux.vdf
View File

@ -1,7 +1,7 @@
"DepotBuildConfig"
{
"DepotID" "1930755"
"contentroot" "$PROJECT_DIR$\tmp_standalone_files_china\shapez.io-demochina-linux-x64"
"contentroot" "$BUNDLE_DIR$\standalone-steam-china-demo\shapez-linux-x64"
"FileMapping"
{
"LocalPath" "*"

2
gulp/steampipe/scripts/demo-china-windows.vdf → gulp/steampipe/templates/demo-china-windows.vdf
View File

@ -1,7 +1,7 @@
"DepotBuildConfig"
{
"DepotID" "1930754"
"contentroot" "$PROJECT_DIR$\tmp_standalone_files_china\shapez.io-demochina-win32-x64"
"contentroot" "$BUNDLE_DIR$\standalone-steam-china-demo\shapez-win32-x64"
"FileMapping"
{
"LocalPath" "*"

2
gulp/steampipe-darwin/scripts/demo-darwin.vdf → gulp/steampipe/templates/demo-darwin.vdf
View File

@ -1,7 +1,7 @@
"DepotBuildConfig"
{
"DepotID" "1930756"
"contentroot" "$PROJECT_DIR$/tmp_standalone_files/shapez.io-demo-darwin-x64"
"contentroot" "$BUNDLE_DIR$\standalone-steam-demo\shapez-darwin-x64"
"FileMapping"
{
"LocalPath" "*"

2
gulp/steampipe/scripts/demo-linux.vdf → gulp/steampipe/templates/demo-linux.vdf
View File

@ -1,7 +1,7 @@
"DepotBuildConfig"
{
"DepotID" "1930752"
"contentroot" "$PROJECT_DIR$\tmp_standalone_files\shapez.io-demo-linux-x64"
"contentroot" "$BUNDLE_DIR$\standalone-steam-demo\shapez-linux-x64"
"FileMapping"
{
"LocalPath" "*"

2
gulp/steampipe/scripts/demo-windows.vdf → gulp/steampipe/templates/demo-windows.vdf
View File

@ -1,7 +1,7 @@
"DepotBuildConfig"
{
"DepotID" "1930753"
"contentroot" "$PROJECT_DIR$\tmp_standalone_files\shapez.io-demo-win32-x64"
"contentroot" "$BUNDLE_DIR$\standalone-steam-demo\shapez-win32-x64"
"FileMapping"
{
"LocalPath" "*"

2
gulp/steampipe/scripts/china-linux.vdf → gulp/steampipe/templates/standalone-china-linux.vdf
View File

@ -1,7 +1,7 @@
"DepotBuildConfig"
{
"DepotID" "1318695"
"contentroot" "$PROJECT_DIR$\tmp_standalone_files_china\shapez.io-standalonechina-linux-x64"
"contentroot" "$BUNDLE_DIR$\standalone-steam-china\shapez-linux-x64"
"FileMapping"
{
"LocalPath" "*"

2
gulp/steampipe/scripts/china-windows.vdf → gulp/steampipe/templates/standalone-china-windows.vdf
View File

@ -1,7 +1,7 @@
"DepotBuildConfig"
{
"DepotID" "1318694"
"contentroot" "$PROJECT_DIR$\shapez.io-standalonechina-win32-x64"
"contentroot" "$BUNDLE_DIR$\standalone-steam-china\shapez-win32-x64"
"FileMapping"
{
"LocalPath" "*"

2
gulp/steampipe-darwin/scripts/darwin.vdf → gulp/steampipe/templates/standalone-darwin.vdf
View File

@ -1,7 +1,7 @@
"DepotBuildConfig"
{
"DepotID" "1318693"
"contentroot" "$PROJECT_DIR$/tmp_standalone_files/shapez.io-standalone-darwin-x64"
"contentroot" "$BUNDLE_DIR$\standalone-steam\shapez-darwin-x64"
"FileMapping"
{
"LocalPath" "*"

2
gulp/steampipe/scripts/linux.vdf → gulp/steampipe/templates/standalone-linux.vdf
View File

@ -1,7 +1,7 @@
"DepotBuildConfig"
{
"DepotID" "1318692"
"contentroot" "$PROJECT_DIR$\tmp_standalone_files\shapez.io-standalone-linux-x64"
"contentroot" "$BUNDLE_DIR$\standalone-steam\shapez-linux-x64"
"FileMapping"
{
"LocalPath" "*"

2
gulp/steampipe/scripts/windows.vdf → gulp/steampipe/templates/standalone-windows.vdf
View File

@ -1,7 +1,7 @@
"DepotBuildConfig"
{
"DepotID" "1318691"
"contentroot" "$PROJECT_DIR$\tmp_standalone_files\shapez.io-standalone-win32-x64"
"contentroot" "$BUNDLE_DIR$\standalone-steam\shapez-win32-x64"
"FileMapping"
{
"LocalPath" "*"

9
gulp/steampipe/tmp/depot_build_1930756.vdf Executable file
View File

@ -0,0 +1,9 @@
"depotbuild"
{
"appid" "1930750"
"depotid" "1930756"
"flags" "0"
"steamid" "76561198992617597"
"manifest" "5433433891569989718"
"baselinemanifest" "213072635964295767"
}

3
gulp/steampipe/upload-darwin-demo.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
yarn gulp standalone.prepareVDF
steamcmd.sh +login $STEAM_UPLOAD_SHAPEZ_ID $STEAM_UPLOAD_SHAPEZ_USER +run_app_build $PWD/built_vdfs/app-darwin-demo.vdf +quit

2
gulp/steampipe-darwin/upload.sh → gulp/steampipe/upload-darwin.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh
yarn gulp standalone.prepareVDF
steamcmd.sh +login $STEAM_UPLOAD_SHAPEZ_ID $STEAM_UPLOAD_SHAPEZ_USER +run_app_build $PWD/scripts/app.vdf +quit
steamcmd.sh +login $STEAM_UPLOAD_SHAPEZ_ID $STEAM_UPLOAD_SHAPEZ_USER +run_app_build $PWD/built_vdfs/app-darwin.vdf +quit

2
gulp/steampipe/upload.bat → gulp/steampipe/upload-winlinux-demo.bat
View File

@ -1,3 +1,3 @@
@echo off
cmd /c yarn gulp standalone.prepareVDF
steamcmd +login %STEAM_UPLOAD_SHAPEZ_ID% %STEAM_UPLOAD_SHAPEZ_USER% +run_app_build %cd%/scripts/app.vdf +quit
steamcmd +login %STEAM_UPLOAD_SHAPEZ_ID% %STEAM_UPLOAD_SHAPEZ_USER% +run_app_build %cd%/built_vdfs/app-winlinux-demo.vdf +quit

2
gulp/steampipe/upload-demo.bat → gulp/steampipe/upload-winlinux.bat
View File

@ -1,3 +1,3 @@
@echo off
cmd /c yarn gulp standalone.prepareVDF
steamcmd +login %STEAM_UPLOAD_SHAPEZ_ID% %STEAM_UPLOAD_SHAPEZ_USER% +run_app_build %cd%/scripts/app-demo.vdf +quit
steamcmd +login %STEAM_UPLOAD_SHAPEZ_ID% %STEAM_UPLOAD_SHAPEZ_USER% +run_app_build %cd%/built_vdfs/app-winlinux.vdf +quit