From 7c75f61be74a6a152640df01bcb60d4c07fd7e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= <gustaf@hanicef.me>
Date: Sat, 3 Jun 2023 13:05:33 +0200
Subject: [PATCH 001/115] Fix buffer overflow when displaying a scrolling
background
---
src/m_menu.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/m_menu.c b/src/m_menu.c
index 64a1c9404..2fc0b889f 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -2807,6 +2807,7 @@ void M_SetMenuCurBackground(const char *defaultname)
{
char name[9];
strncpy(name, defaultname, 8);
+ name[8] = '\0';
M_IterateMenuTree(MIT_SetCurBackground, &name);
}
From fb9e6c9c6d34cdb4b3750969bdae81095db327f4 Mon Sep 17 00:00:00 2001
From: Zwip-Zwap Zapony <ZwipZwapZapony@gmail.com>
Date: Fri, 22 Sep 2023 18:16:54 +0200
Subject: [PATCH 002/115] Use if-range instead of switch for demo versions
---
src/g_demo.c | 89 +++++++++++++---------------------------------------
1 file changed, 22 insertions(+), 67 deletions(-)
diff --git a/src/g_demo.c b/src/g_demo.c
index 4e959bcf3..cb168dfd9 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -1891,16 +1891,9 @@ UINT8 G_CmpDemoTime(char *oldname, char *newname)
p++; // VERSION
p++; // SUBVERSION
oldversion = READUINT16(p);
- switch(oldversion) // demoversion
+ if (oldversion < 0x000c || oldversion > DEMOVERSION)
{
- case DEMOVERSION: // latest always supported
- case 0x000f: // The previous demoversions also supported
- case 0x000e:
- case 0x000d: // all that changed between then and now was longer color name
- case 0x000c:
- break;
- // too old, cannot support.
- default:
+ // too old (or new), cannot support
CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
Z_Free(buffer);
return UINT8_MAX;
@@ -1973,14 +1966,11 @@ void G_DoPlayDemo(char *defdemoname)
UINT8 i;
lumpnum_t l;
char skin[17],color[MAXCOLORNAME+1],*n,*pdemoname;
- UINT8 version,subversion,charability,charability2,thrustfactor,accelstart,acceleration,cnamelen;
+ UINT8 version,subversion,charability,charability2,thrustfactor,accelstart,acceleration;
pflags_t pflags;
UINT32 randseed, followitem;
fixed_t camerascale,shieldscale,actionspd,mindash,maxdash,normalspeed,runspeed,jumpfactor,height,spinheight;
char msg[1024];
-#ifdef OLD22DEMOCOMPAT
- boolean use_old_demo_vars = false;
-#endif
skin[16] = '\0';
color[MAXCOLORNAME] = '\0';
@@ -2039,23 +2029,13 @@ void G_DoPlayDemo(char *defdemoname)
subversion = READUINT8(demo_p);
demoversion = READUINT16(demo_p);
demo_forwardmove_rng = (demoversion < 0x0010);
- switch(demoversion)
- {
- case 0x000f:
- case 0x000d:
- case 0x000e:
- case DEMOVERSION: // latest always supported
- cnamelen = MAXCOLORNAME;
- break;
#ifdef OLD22DEMOCOMPAT
- // all that changed between then and now was longer color name
- case 0x000c:
- cnamelen = 16;
- use_old_demo_vars = true;
- break;
+ if (demoversion < 0x000c || demoversion > DEMOVERSION)
+#else
+ if (demoversion < 0x000d || demoversion > DEMOVERSION)
#endif
- // too old, cannot support.
- default:
+ {
+ // too old (or new), cannot support
snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);
CONS_Alert(CONS_ERROR, "%s", msg);
M_StartMessage(msg, NULL, MM_NOTHING);
@@ -2182,8 +2162,8 @@ void G_DoPlayDemo(char *defdemoname)
demo_p += 16;
// Color
- M_Memcpy(color,demo_p,cnamelen);
- demo_p += cnamelen;
+ M_Memcpy(color, demo_p, (demoversion < 0x000d) ? 16 : MAXCOLORNAME);
+ demo_p += (demoversion < 0x000d) ? 16 : MAXCOLORNAME;
charability = READUINT8(demo_p);
charability2 = READUINT8(demo_p);
@@ -2219,7 +2199,7 @@ void G_DoPlayDemo(char *defdemoname)
// net var data
#ifdef OLD22DEMOCOMPAT
- if (use_old_demo_vars)
+ if (demoversion < 0x000d)
CV_LoadOldDemoVars(&demo_p);
else
#endif
@@ -2352,19 +2332,13 @@ UINT8 G_CheckDemoForError(char *defdemoname)
demo_p++; // version
demo_p++; // subversion
our_demo_version = READUINT16(demo_p);
- switch(our_demo_version)
- {
- case 0x000d:
- case 0x000e:
- case 0x000f:
- case DEMOVERSION: // latest always supported
- break;
#ifdef OLD22DEMOCOMPAT
- case 0x000c:
- break;
+ if (our_demo_version < 0x000c || our_demo_version > DEMOVERSION)
+#else
+ if (our_demo_version < 0x000d || our_demo_version > DEMOVERSION)
#endif
- // too old, cannot support.
- default:
+ {
+ // too old (or new), cannot support
return DFILE_ERROR_NOTDEMO;
}
demo_p += 16; // demo checksum
@@ -2386,7 +2360,6 @@ void G_AddGhost(char *defdemoname)
INT32 i;
lumpnum_t l;
char name[17],skin[17],color[MAXCOLORNAME+1],*n,*pdemoname,md5[16];
- UINT8 cnamelen;
demoghost *gh;
UINT8 flags, subversion;
UINT8 *buffer,*p;
@@ -2438,20 +2411,9 @@ void G_AddGhost(char *defdemoname)
p++; // VERSION
subversion = READUINT8(p); // SUBVERSION
ghostversion = READUINT16(p);
- switch(ghostversion)
+ if (ghostversion < 0x000c || ghostversion > DEMOVERSION)
{
- case 0x000f:
- case 0x000d:
- case 0x000e:
- case DEMOVERSION: // latest always supported
- cnamelen = MAXCOLORNAME;
- break;
- // all that changed between then and now was longer color name
- case 0x000c:
- cnamelen = 16;
- break;
- // too old, cannot support.
- default:
+ // too old (or new), cannot support
CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo version incompatible.\n"), pdemoname);
Z_Free(pdemoname);
Z_Free(buffer);
@@ -2514,8 +2476,8 @@ void G_AddGhost(char *defdemoname)
p += 16;
// Color
- M_Memcpy(color, p,cnamelen);
- p += cnamelen;
+ M_Memcpy(color, p, (ghostversion < 0x000d) ? 16 : MAXCOLORNAME);
+ p += (ghostversion < 0x000d) ? 16 : MAXCOLORNAME;
// Ghosts do not have a player structure to put this in.
p++; // charability
@@ -2698,16 +2660,9 @@ void G_DoPlayMetal(void)
metal_p++; // VERSION
metal_p++; // SUBVERSION
metalversion = READUINT16(metal_p);
- switch(metalversion)
+ if (metalversion < 0x000c || metalversion > DEMOVERSION)
{
- case DEMOVERSION: // latest always supported
- case 0x000f:
- case 0x000e: // There are checks wheter the momentum is from older demo versions or not
- case 0x000d: // all that changed between then and now was longer color name
- case 0x000c:
- break;
- // too old, cannot support.
- default:
+ // too old (or new), cannot support
CONS_Alert(CONS_WARNING, M_GetText("Failed to load bot recording for this map, format version incompatible.\n"));
Z_Free(metalbuffer);
return;
From 12d595399ec20b30dfcb99ff3358cd309fafc980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= <gustaf@hanicef.me>
Date: Sun, 1 Oct 2023 17:34:13 +0200
Subject: [PATCH 003/115] Avoid branch prediction slowdowns in R_PointOnSide
---
src/r_main.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/r_main.c b/src/r_main.c
index 54f7d7639..0655bd06f 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -249,7 +249,7 @@ static void FlipCam2_OnChange(void)
//
// killough 5/2/98: reformatted
//
-INT32 R_PointOnSide(fixed_t x, fixed_t y, node_t *node)
+INT32 R_PointOnSide(fixed_t x, fixed_t y, node_t *restrict node)
{
if (!node->dx)
return x <= node->x ? node->dy > 0 : node->dy < 0;
@@ -261,9 +261,10 @@ INT32 R_PointOnSide(fixed_t x, fixed_t y, node_t *node)
fixed_t dy = (y >> 1) - (node->y >> 1);
// Try to quickly decide by looking at sign bits.
- if ((node->dy ^ node->dx ^ dx ^ dy) < 0)
- return (node->dy ^ dx) < 0; // (left is negative)
- return FixedMul(dy, node->dx>>FRACBITS) >= FixedMul(node->dy>>FRACBITS, dx);
+ // also use a mask to avoid branch prediction
+ INT32 mask = (node->dy ^ node->dx ^ dx ^ dy) >> 31;
+ return (mask & ((node->dy ^ dx) < 0)) | // (left is negative)
+ (~mask & (FixedMul(dy, node->dx>>FRACBITS) >= FixedMul(node->dy>>FRACBITS, dx)));
}
// killough 5/2/98: reformatted
From 5aa89a712ab29c514e0aa6e7df493abdb5a2fbd7 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Tue, 10 Oct 2023 23:40:41 +0000
Subject: [PATCH 004/115] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
create mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..d260df55c
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,35 @@
+# This file is a template, and might need editing before it works on your project.
+# This is a sample GitLab CI/CD configuration file that should run without any modifications.
+# It demonstrates a basic 3 stage CI/CD pipeline. Instead of real tests or scripts,
+# it uses echo commands to simulate the pipeline execution.
+#
+# A pipeline is composed of independent jobs that run scripts, grouped into stages.
+# Stages run in sequential order, but jobs within stages run in parallel.
+#
+# For more information, see: https://docs.gitlab.com/ee/ci/yaml/index.html#stages
+#
+# You can copy and paste this template into a new `.gitlab-ci.yml` file.
+# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword.
+#
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
+# https://docs.gitlab.com/ee/development/cicd/templates.html
+# This specific template is located at:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml
+
+stages: # List of stages for jobs, and their order of execution
+ - build
+
+
+build-job: # This job runs in the build stage, which runs first.
+ stage: build
+ image: cimg
+ #artifacts:
+ # paths:
+ # - "*.bin"
+
+ script:
+ - "ls"
+
+
+
+
From eb44efbc2f412474ffcec9136bd43337edd980f9 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Tue, 10 Oct 2023 23:43:50 +0000
Subject: [PATCH 005/115] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d260df55c..cc2f89868 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ build-job: # This job runs in the build stage, which runs first.
script:
- "ls"
-
+ - "pwd"
From 124aca3267da8b4f4f504f6e8feb55bc265c5429 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Tue, 10 Oct 2023 23:46:11 +0000
Subject: [PATCH 006/115] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc2f89868..443295881 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ stages: # List of stages for jobs, and their order of execution
build-job: # This job runs in the build stage, which runs first.
stage: build
- image: cimg
+ image: debian
#artifacts:
# paths:
# - "*.bin"
From 9f8bc2125363eef882e62ef9f42f011bc45f31d6 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Tue, 10 Oct 2023 23:54:46 +0000
Subject: [PATCH 007/115] Update .gitlab-ci.yml file try running the makefile
with nothing
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 443295881..76f4783ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,8 +28,9 @@ build-job: # This job runs in the build stage, which runs first.
# - "*.bin"
script:
- - "ls"
- - "pwd"
+ - "apt update"
+ - "apt-get install --no-install-recommends --yes make"
+ - "make --directory=src"
From 959c1753d3c7e7abc5593fa3907ee620296cc372 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 00:05:38 +0000
Subject: [PATCH 008/115] Update .gitlab-ci.yml file try running the makefile
with some dispends libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev
libgme-dev upx git libopenmpt-dev gettext
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76f4783ca..aac53e06b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ build-job: # This job runs in the build stage, which runs first.
script:
- "apt update"
- - "apt-get install --no-install-recommends --yes make"
+ - "apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev upx git libopenmpt-dev gettext"
- "make --directory=src"
From 7083dffc01be2e91bda59c96fa40d75fbfbb0037 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 00:08:16 +0000
Subject: [PATCH 009/115] Update .gitlab-ci.yml file remove upx install
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aac53e06b..e768c1735 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,8 +29,8 @@ build-job: # This job runs in the build stage, which runs first.
script:
- "apt update"
- - "apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev upx git libopenmpt-dev gettext"
- - "make --directory=src"
+ - "apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext"
+ - "make --directory=src "
From 4adce8e3cddad16d48e7244edd0616a166ed17f4 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 00:23:05 +0000
Subject: [PATCH 010/115] Update .gitlab-ci.yml file keep artifacts try using
ccache
---
.gitlab-ci.yml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e768c1735..de3ff8a73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,14 +23,15 @@ stages: # List of stages for jobs, and their order of execution
build-job: # This job runs in the build stage, which runs first.
stage: build
image: debian
- #artifacts:
- # paths:
- # - "*.bin"
+ artifacts:
+ paths:
+ - "bin/*"
script:
+ - ""
- "apt update"
- - "apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext"
- - "make --directory=src "
+ - "apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache"
+ - "CC=\"ccache gcc\" make --directory=src "
From b3273a899aa5773c86a9110a7f57403b8544f6e8 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 00:40:49 +0000
Subject: [PATCH 011/115] Update .gitlab-ci.yml file cache the ccache
---
.gitlab-ci.yml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de3ff8a73..913823b67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,15 +23,22 @@ stages: # List of stages for jobs, and their order of execution
build-job: # This job runs in the build stage, which runs first.
stage: build
image: debian
+ cache:
+ - key:
+ files:
+ - .ccache/stats
+ paths:
+ - .ccache
artifacts:
paths:
- "bin/*"
script:
- - ""
- "apt update"
- "apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache"
- - "CC=\"ccache gcc\" make --directory=src "
+ - "ccache --max-size 10M"
+ - "CC=\"ccache gcc\" make --directory=src"
+ - "ccache --show-stats"
From 67dcc2dd0af4f48e4232b6c9d358fbfae5138f9c Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 00:49:43 +0000
Subject: [PATCH 012/115] Update .gitlab-ci.yml file cache the ccache part two
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 913823b67..a8eb0854f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ build-job: # This job runs in the build stage, which runs first.
files:
- .ccache/stats
paths:
- - .ccache
+ - .ccache/
artifacts:
paths:
- "bin/*"
From 219691895df27ad5314304c4fe5eaca1977cc407 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 01:10:02 +0000
Subject: [PATCH 013/115] Update .gitlab-ci.yml file use variables to test if
we are using DigitalOcean
---
.gitlab-ci.yml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8eb0854f..b593c478c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,8 @@
# This specific template is located at:
# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml
+
+
stages: # List of stages for jobs, and their order of execution
- build
@@ -23,6 +25,9 @@ stages: # List of stages for jobs, and their order of execution
build-job: # This job runs in the build stage, which runs first.
stage: build
image: debian
+ variables:
+ CCMaxSize: "10M"
+ CCC: "ccache gcc"
cache:
- key:
files:
@@ -36,9 +41,10 @@ build-job: # This job runs in the build stage, which runs first.
script:
- "apt update"
- "apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache"
- - "ccache --max-size 10M"
- - "CC=\"ccache gcc\" make --directory=src"
+ - "ccache --max-size $CCMaxSize"
+ - "CC=\"$CCC\" make --directory=src"
- "ccache --show-stats"
+ - "echo Are we running on DO? $DigitalOceanDebianMirror"
From 0f2d3e9134ed658ac7f94de87b83f2b18b1931bb Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 01:26:22 +0000
Subject: [PATCH 014/115] Update .gitlab-ci.yml file fix ccache path
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b593c478c..d2c27a221 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,9 +31,9 @@ build-job: # This job runs in the build stage, which runs first.
cache:
- key:
files:
- - .ccache/stats
+ - .cache/ccache/stats
paths:
- - .ccache/
+ - .cache/ccache/
artifacts:
paths:
- "bin/*"
From 2fae2b54db1f203a7b5d538372924491fdb98798 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 01:39:08 +0000
Subject: [PATCH 015/115] Update .gitlab-ci.yml file fix ccache path part two
---
.gitlab-ci.yml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2c27a221..7ee079494 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,8 @@ build-job: # This job runs in the build stage, which runs first.
image: debian
variables:
CCMaxSize: "10M"
- CCC: "ccache gcc"
+ CC: "ccache gcc"
+ CCACHE_DIR: "$CI_BUILDS_DIR/.cache/ccache"
cache:
- key:
files:
@@ -39,10 +40,13 @@ build-job: # This job runs in the build stage, which runs first.
- "bin/*"
script:
+ - "export $CC"
+ - "export $CCACHE_DIR"
+ - "export $CI_BUILDS_DIR"
- "apt update"
- "apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache"
- "ccache --max-size $CCMaxSize"
- - "CC=\"$CCC\" make --directory=src"
+ - "make --directory=src"
- "ccache --show-stats"
- "echo Are we running on DO? $DigitalOceanDebianMirror"
From 16741b2cb0577d8c5ad917a5909187ed359a4c63 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 02:08:04 +0000
Subject: [PATCH 016/115] Update .gitlab-ci.yml file fix ccache path part three
---
.gitlab-ci.yml | 39 ++++++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ee079494..738895268 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,28 +27,37 @@ build-job: # This job runs in the build stage, which runs first.
image: debian
variables:
CCMaxSize: "10M"
- CC: "ccache gcc"
- CCACHE_DIR: "$CI_BUILDS_DIR/.cache/ccache"
cache:
- - key:
- files:
- - .cache/ccache/stats
+ - key: ccache-$CI_JOB_NAME_SLUG
+ fallback_keys:
+ - cache-$CI_DEFAULT_BRANCH
+ - cache-default
paths:
- - .cache/ccache/
+ - ccache
artifacts:
paths:
- "bin/*"
+ before_script:
+ - export PATH="/usr/lib/ccache:$PATH"
+ - export CCACHE_BASEDIR="$PWD"
+ - export CCACHE_DIR="$PWD/ccache"
+ - export CCACHE_COMPILERCHECK=content
+ - ccache --max-size $CCMaxSize
+ - ccache --zero-stats || true
+ - ccache --show-stats || true
+ after_script:
+ - export CCACHE_DIR="$PWD/ccache"
+ - ccache --show-stats
+
script:
- - "export $CC"
- - "export $CCACHE_DIR"
- - "export $CI_BUILDS_DIR"
- - "apt update"
- - "apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache"
- - "ccache --max-size $CCMaxSize"
- - "make --directory=src"
- - "ccache --show-stats"
- - "echo Are we running on DO? $DigitalOceanDebianMirror"
+ - pwd
+ - echo "$CI_JOB_NAME_SLUG"
+ - echo "$CCACHE_DIR"
+ - echo Are we running on DO? "$DigitalOceanDebianMirror"
+ - apt update
+ - apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache
+ - make --directory=src
From 84a2463d2f45287e04a69056fc1485692c824d18 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 02:09:54 +0000
Subject: [PATCH 017/115] Update .gitlab-ci.yml file fix ccache path part four
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 738895268..2f089efc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,6 +42,8 @@ build-job: # This job runs in the build stage, which runs first.
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
+ - apt update
+ - apt-get install --no-install-recommends ccache
- ccache --max-size $CCMaxSize
- ccache --zero-stats || true
- ccache --show-stats || true
@@ -55,8 +57,7 @@ build-job: # This job runs in the build stage, which runs first.
- echo "$CI_JOB_NAME_SLUG"
- echo "$CCACHE_DIR"
- echo Are we running on DO? "$DigitalOceanDebianMirror"
- - apt update
- - apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache
+ - apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext
- make --directory=src
From 0ff83947ac4349f89d5f46835aeedff7364a4b9b Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 02:11:04 +0000
Subject: [PATCH 018/115] Update .gitlab-ci.yml file fix ccache path part 5
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f089efc9..037608416 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ build-job: # This job runs in the build stage, which runs first.
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
- apt update
- - apt-get install --no-install-recommends ccache
+ - apt-get install --no-install-recommends --yes ccache
- ccache --max-size $CCMaxSize
- ccache --zero-stats || true
- ccache --show-stats || true
From 4b015c91e12dcc7d8a7056e0d16c2431f2272884 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 03:03:37 +0000
Subject: [PATCH 019/115] Update .gitlab-ci.yml file rename ccache keys up
ccache size to 30M
---
.gitlab-ci.yml | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 037608416..68d5c5eb1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,16 +22,16 @@ stages: # List of stages for jobs, and their order of execution
- build
-build-job: # This job runs in the build stage, which runs first.
+build-native: # This job runs in the build stage, which runs first.
stage: build
image: debian
variables:
- CCMaxSize: "10M"
+ CCACHE_MAXSIZE: "30M"
cache:
- - key: ccache-$CI_JOB_NAME_SLUG
+ - key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
fallback_keys:
- - cache-$CI_DEFAULT_BRANCH
- - cache-default
+ - cache-$CI_PROJECT_PATH_SLUG-$CI_DEFAULT_BRANCH
+ - cache-$CI_PROJECT_PATH_SLUG-default
paths:
- ccache
artifacts:
@@ -44,19 +44,12 @@ build-job: # This job runs in the build stage, which runs first.
- export CCACHE_COMPILERCHECK=content
- apt update
- apt-get install --no-install-recommends --yes ccache
- - ccache --max-size $CCMaxSize
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- export CCACHE_DIR="$PWD/ccache"
- ccache --show-stats
-
-
script:
- - pwd
- - echo "$CI_JOB_NAME_SLUG"
- - echo "$CCACHE_DIR"
- - echo Are we running on DO? "$DigitalOceanDebianMirror"
- apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext
- make --directory=src
From 92f16c8142cd035049cbde95008400072cdade28 Mon Sep 17 00:00:00 2001
From: Logan Arias <logan.gba@gmail.com>
Date: Wed, 11 Oct 2023 04:11:56 +0000
Subject: [PATCH 020/115] Update .gitlab-ci.yml file use git clone options up
CCACHE size to 50M
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68d5c5eb1..3a0eff4ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,9 @@ build-native: # This job runs in the build stage, which runs first.
stage: build
image: debian
variables:
- CCACHE_MAXSIZE: "30M"
+ CCACHE_MAXSIZE: "50M"
+ GIT_STRATEGY: clone
+ GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
fallback_keys:
From 3ee5ed2dacfadfcfad4ddc38bfae17c24379a6ab Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 11 Oct 2023 04:25:05 +0000
Subject: [PATCH 021/115] Update .gitlab-ci.yml file cache apt packages
---
.gitlab-ci.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a0eff4ad..48cf42697 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,9 @@ build-native: # This job runs in the build stage, which runs first.
- cache-$CI_PROJECT_PATH_SLUG-default
paths:
- ccache
+ - key: apt
+ paths:
+ - /var/cache/apt
artifacts:
paths:
- "bin/*"
@@ -44,7 +47,7 @@ build-native: # This job runs in the build stage, which runs first.
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
- - apt update
+ - apt-get update
- apt-get install --no-install-recommends --yes ccache
- ccache --zero-stats || true
- ccache --show-stats || true
From 3ef89e990216233abbd95db7201d25d70da261a0 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 11 Oct 2023 04:27:50 +0000
Subject: [PATCH 022/115] Update .gitlab-ci.yml file cache apt packages, part 2
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48cf42697..37c6d76e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ build-native: # This job runs in the build stage, which runs first.
- ccache
- key: apt
paths:
- - /var/cache/apt
+ - /var/cache/apt/
artifacts:
paths:
- "bin/*"
From 9597a19ecf0106f5198df19b7bb9e8847f6ec858 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 11 Oct 2023 04:37:01 +0000
Subject: [PATCH 023/115] Update .gitlab-ci.yml file cache apt packages, part 3
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37c6d76e8..22724f679 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ build-native: # This job runs in the build stage, which runs first.
- ccache
- key: apt
paths:
- - /var/cache/apt/
+ - apt
artifacts:
paths:
- "bin/*"
@@ -47,6 +47,7 @@ build-native: # This job runs in the build stage, which runs first.
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
+ - echo Dir::Cache="$PWD/apt" > /etc/apt/apt.conf.d/99cache
- apt-get update
- apt-get install --no-install-recommends --yes ccache
- ccache --zero-stats || true
From 7231631a3ff391be9b3fb889ee20cfc6d033d84c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 11 Oct 2023 04:39:48 +0000
Subject: [PATCH 024/115] Update .gitlab-ci.yml file cache apt packages, part 4
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22724f679..2e388ac18 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ build-native: # This job runs in the build stage, which runs first.
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
- - echo Dir::Cache="$PWD/apt" > /etc/apt/apt.conf.d/99cache
+ - echo Dir::Cache="$PWD/apt" | tee /etc/apt/apt.conf.d/99cache
- apt-get update
- apt-get install --no-install-recommends --yes ccache
- ccache --zero-stats || true
From eb6ed2e7e7e657abf48b63e0faa17058d111b509 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 11 Oct 2023 04:43:22 +0000
Subject: [PATCH 025/115] Update .gitlab-ci.yml file cache apt packages, part 5
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e388ac18..18ae4459c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ build-native: # This job runs in the build stage, which runs first.
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
- - echo Dir::Cache="$PWD/apt" | tee /etc/apt/apt.conf.d/99cache
+ - echo -n Dir::Cache="$PWD/apt" | tee /etc/apt/apt.conf.d/99cache
- apt-get update
- apt-get install --no-install-recommends --yes ccache
- ccache --zero-stats || true
From 3db57df3532db301b4dd4374fcf119ffbb68f584 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 11 Oct 2023 04:57:29 +0000
Subject: [PATCH 026/115] Update .gitlab-ci.yml file cache apt packages, part 6
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18ae4459c..7bc250338 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,9 @@ build-native: # This job runs in the build stage, which runs first.
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
- - echo -n Dir::Cache="$PWD/apt" | tee /etc/apt/apt.conf.d/99cache
+ - export APT_CACHE_DIR=`pwd`/apt-cache
+ - mkdir --parents --verbose $APT_CACHE_DIR/partial/
+ - echo dir::cache::archives="$APT_CACHE_DIR" | tee --append /etc/apt/apt.conf.d/99cache
- apt-get update
- apt-get install --no-install-recommends --yes ccache
- ccache --zero-stats || true
From 97096445dfb445f1eb35c3e4d573100a65043930 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 11 Oct 2023 05:00:08 +0000
Subject: [PATCH 027/115] Update .gitlab-ci.yml file cache apt packages, part 7
---
.gitlab-ci.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bc250338..30db01e1e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,16 +49,15 @@ build-native: # This job runs in the build stage, which runs first.
- export CCACHE_COMPILERCHECK=content
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- - echo dir::cache::archives="$APT_CACHE_DIR" | tee --append /etc/apt/apt.conf.d/99cache
- apt-get update
- - apt-get install --no-install-recommends --yes ccache
+ - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes ccache
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- export CCACHE_DIR="$PWD/ccache"
- ccache --show-stats
script:
- - apt-get install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext
+ - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext
- make --directory=src
From 37909c95b18a328381a587c440a49695821732f9 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 11 Oct 2023 05:03:19 +0000
Subject: [PATCH 028/115] Update .gitlab-ci.yml file cache apt packages, part 8
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30db01e1e..02b2edc92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ build-native: # This job runs in the build stage, which runs first.
- ccache
- key: apt
paths:
- - apt
+ - apt-cache
artifacts:
paths:
- "bin/*"
From e7417ea11653ed3f52d9c813150ab63a35e4f16a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 11 Oct 2023 05:07:25 +0000
Subject: [PATCH 029/115] Update .gitlab-ci.yml file switch docker image to
debian, slim version
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02b2edc92..2e21653d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ stages: # List of stages for jobs, and their order of execution
build-native: # This job runs in the build stage, which runs first.
stage: build
- image: debian
+ image: debian-slim
variables:
CCACHE_MAXSIZE: "50M"
GIT_STRATEGY: clone
From 4b43f92b134f2d8841a8b1af65460d44e6b28bd5 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 11 Oct 2023 05:10:23 +0000
Subject: [PATCH 030/115] Update .gitlab-ci.yml file switch docker image to
debian, slim version, part 2
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e21653d7..597a6cb8a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ stages: # List of stages for jobs, and their order of execution
build-native: # This job runs in the build stage, which runs first.
stage: build
- image: debian-slim
+ image: debian:stable-slim
variables:
CCACHE_MAXSIZE: "50M"
GIT_STRATEGY: clone
From 8b4548384249d211a8d8f82bb18281f8d75dace5 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 01:06:00 +0000
Subject: [PATCH 031/115] Update .gitlab-ci.yml file autoclean apt cache and
change cache key to image name
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 597a6cb8a..0cf36d679 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ build-native: # This job runs in the build stage, which runs first.
- cache-$CI_PROJECT_PATH_SLUG-default
paths:
- ccache
- - key: apt
+ - key: apt-$CI_JOB_IMAGE
paths:
- apt-cache
artifacts:
@@ -50,14 +50,14 @@ build-native: # This job runs in the build stage, which runs first.
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- apt-get update
- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes ccache
+ - pt-get -o dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- export CCACHE_DIR="$PWD/ccache"
- ccache --show-stats
+ - apt-get autoclean
script:
- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext
- make --directory=src
From 53eafa046cef88f21d347fd71769da72fbce4c7f Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 01:07:42 +0000
Subject: [PATCH 032/115] Update .gitlab-ci.yml file fixup typo
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cf36d679..c7301e418 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,7 +50,7 @@ build-native: # This job runs in the build stage, which runs first.
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- apt-get update
- - pt-get -o dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache
+ - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
From d7ea647f9bc74ff8787c9d3fa817d8bc01aa81ab Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 01:21:23 +0000
Subject: [PATCH 033/115] Update .gitlab-ci.yml file apt cache do not need to
be protected also, name artifact for binaries from build-native job
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7301e418..e182098b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,9 +39,11 @@ build-native: # This job runs in the build stage, which runs first.
- key: apt-$CI_JOB_IMAGE
paths:
- apt-cache
+ unprotect: true
artifacts:
paths:
- "bin/*"
+ name: "Debian native"
before_script:
- export PATH="/usr/lib/ccache:$PATH"
- export CCACHE_BASEDIR="$PWD"
@@ -51,12 +53,12 @@ build-native: # This job runs in the build stage, which runs first.
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- apt-get update
- apt-get -o dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache
+ - apt-get autoclean
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- export CCACHE_DIR="$PWD/ccache"
- ccache --show-stats
- - apt-get autoclean
script:
- make --directory=src
From dc2a5b949692c35505d60910afbf22fd1ccfb331 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 01:36:29 +0000
Subject: [PATCH 034/115] Update .gitlab-ci.yml file do not play games with
$PATH
---
.gitlab-ci.yml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e182098b5..14f171d04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,21 +45,24 @@ build-native: # This job runs in the build stage, which runs first.
- "bin/*"
name: "Debian native"
before_script:
- - export PATH="/usr/lib/ccache:$PATH"
- - export CCACHE_BASEDIR="$PWD"
- - export CCACHE_DIR="$PWD/ccache"
- - export CCACHE_COMPILERCHECK=content
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- apt-get update
- apt-get -o dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache
- apt-get autoclean
+ - export CCACHE_BASEDIR="$PWD"
+ - export CCACHE_DIR="$PWD/ccache"
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
+ - export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- ccache --show-stats
script:
+ - export CC="ccache gcc"
+ - export CCACHE_BASEDIR="$PWD"
+ - export CCACHE_DIR="$PWD/ccache"
+ - export CCACHE_COMPILERCHECK=content
- make --directory=src
From dbd40ef4220ad83100a42dacc6d7228fc32439b3 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 01:52:52 +0000
Subject: [PATCH 035/115] Update .gitlab-ci.yml file auto cache our apt cache
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14f171d04..7abbfc980 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,7 +49,7 @@ build-native: # This job runs in the build stage, which runs first.
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- apt-get update
- apt-get -o dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache
- - apt-get autoclean
+ - apt-get -o dir::cache::archives="$APT_CACHE_DIR" autoclean
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- ccache --zero-stats || true
From 01fc7810e28028304a899f55007e7808d33f594c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 02:03:04 +0000
Subject: [PATCH 036/115] Update .gitlab-ci.yml file use DO mirror?
---
.gitlab-ci.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7abbfc980..94e1676a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,11 +45,13 @@ build-native: # This job runs in the build stage, which runs first.
- "bin/*"
name: "Debian native"
before_script:
+ - sed --expression="s/deb.debian.org/mirrors.digitalocean.com/g" /etc/apt/sources.list > /etc/apt/sources.list.d/debian.list
+ - rm --force /etc/apt/sources.list
+ - apt-get update
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- - apt-get update
- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache
- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" autoclean
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- ccache --zero-stats || true
From 27776173ca16431067aeadeba06b8b0ef8bd8701 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 02:08:24 +0000
Subject: [PATCH 037/115] Update .gitlab-ci.yml file let see what in the
/etc/apt folder
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94e1676a2..61c03e315 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,8 +45,9 @@ build-native: # This job runs in the build stage, which runs first.
- "bin/*"
name: "Debian native"
before_script:
- - sed --expression="s/deb.debian.org/mirrors.digitalocean.com/g" /etc/apt/sources.list > /etc/apt/sources.list.d/debian.list
- - rm --force /etc/apt/sources.list
+ - ls --human-readable --all -l /etc/apt/sources.list*
+ - rem sed --expression="s/deb.debian.org/mirrors.digitalocean.com/g" /etc/apt/sources.list > /etc/apt/sources.list.d/debian.list
+ - rem rm --force /etc/apt/sources.list
- apt-get update
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
From 58a10836f0520c05b22422f9e49d7ec00e1c244d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 02:15:47 +0000
Subject: [PATCH 038/115] Update .gitlab-ci.yml file try to overwrite mirrors
file
---
.gitlab-ci.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61c03e315..edc47f3b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,9 +45,7 @@ build-native: # This job runs in the build stage, which runs first.
- "bin/*"
name: "Debian native"
before_script:
- - ls --human-readable --all -l /etc/apt/sources.list*
- - rem sed --expression="s/deb.debian.org/mirrors.digitalocean.com/g" /etc/apt/sources.list > /etc/apt/sources.list.d/debian.list
- - rem rm --force /etc/apt/sources.list
+ - if [ $DigitalOceanDebianMirror == "1" ]; then echo http://mirrors.digitalocean.com/debian | tee /etc/apt/mirrors/debian.list; fi
- apt-get update
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
From f015b6ea68b5a1df40ea63b03bb36936246f7253 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 02:18:29 +0000
Subject: [PATCH 039/115] Update .gitlab-ci.yml file let look inside
debian.sources
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index edc47f3b9..172fba5bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,8 @@ build-native: # This job runs in the build stage, which runs first.
- "bin/*"
name: "Debian native"
before_script:
- - if [ $DigitalOceanDebianMirror == "1" ]; then echo http://mirrors.digitalocean.com/debian | tee /etc/apt/mirrors/debian.list; fi
+ - cat /etc/apt/sources.list.d/debian.sources
+ - if [ $DigitalOceanDebianMirror == "1" ]; then echo http://mirrors.digitalocean.com/debian | tee /etc/apt/mirrors/debian.list; fi || true
- apt-get update
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
From 735b8314e82a50bfb8f22a28d622dd0a62670790 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 02:23:36 +0000
Subject: [PATCH 040/115] Update .gitlab-ci.yml file forget about change the
Debian mirror
---
.gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 172fba5bc..529d5d914 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,8 +45,6 @@ build-native: # This job runs in the build stage, which runs first.
- "bin/*"
name: "Debian native"
before_script:
- - cat /etc/apt/sources.list.d/debian.sources
- - if [ $DigitalOceanDebianMirror == "1" ]; then echo http://mirrors.digitalocean.com/debian | tee /etc/apt/mirrors/debian.list; fi || true
- apt-get update
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
From 95c81696a5594442ae9795fedccace91dd7b72d7 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 03:00:34 +0000
Subject: [PATCH 041/115] Update .gitlab-ci.yml file build Mingw64 binary
---
.gitlab-ci.yml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 529d5d914..75415adc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ build-native: # This job runs in the build stage, which runs first.
- apt-get update
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache mingw-w64
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
@@ -59,11 +59,10 @@ build-native: # This job runs in the build stage, which runs first.
- export CCACHE_DIR="$PWD/ccache"
- ccache --show-stats
script:
- - export CC="ccache gcc"
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
- - make --directory=src
-
+ - make --directory=src CCACHE=1
+ - make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64
From ae25f9ac4495e18bfc0c6c119e7dea9356477d3d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 03:06:17 +0000
Subject: [PATCH 042/115] Update .gitlab-ci.yml file yea the Mingw-w64 is
called "x86_64-w64-mingw32", not "x86_64-w64"
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75415adc9..1ceaa1ef1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,6 +63,6 @@ build-native: # This job runs in the build stage, which runs first.
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
- make --directory=src CCACHE=1
- - make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64
+ - make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
From ff4c4c806a9a9a41915b4eff736dd75eb01eb3dd Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 04:12:15 +0000
Subject: [PATCH 043/115] Update .gitlab-ci.yml file split build job for each
target: x86-64, Win32, Win64
---
.gitlab-ci.yml | 47 +++++++++++++++++++++++++++++++++++------------
1 file changed, 35 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ceaa1ef1..88872359f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,8 +21,7 @@
stages: # List of stages for jobs, and their order of execution
- build
-
-build-native: # This job runs in the build stage, which runs first.
+.job_template: &job_build # This job runs in the build stage, which runs first.
stage: build
image: debian:stable-slim
variables:
@@ -40,10 +39,6 @@ build-native: # This job runs in the build stage, which runs first.
paths:
- apt-cache
unprotect: true
- artifacts:
- paths:
- - "bin/*"
- name: "Debian native"
before_script:
- apt-get update
- export APT_CACHE_DIR=`pwd`/apt-cache
@@ -58,11 +53,39 @@ build-native: # This job runs in the build stage, which runs first.
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- ccache --show-stats
+
+.default_Scripts: &ccache
+ - export CCACHE_BASEDIR="$PWD"
+ - export CCACHE_DIR="$PWD/ccache"
+ - export CCACHE_COMPILERCHECK=content
+
+build-x86_64-linux-gnu:
+ <<: *job_build
+ artifacts:
+ paths:
+ - "bin/lsdl2srb2*"
+ name: "x86-64"
script:
- - export CCACHE_BASEDIR="$PWD"
- - export CCACHE_DIR="$PWD/ccache"
- - export CCACHE_COMPILERCHECK=content
- - make --directory=src CCACHE=1
+ - *ccache
+ - export CC="x86_64-linux-gnu-gcc
+ - make --directory=src CCACHE=1 LINUX64=1
+
+build-i686-w64-mingw32:
+ <<: *job_build
+ artifacts:
+ paths:
+ - "bin/srb2win.exe*"
+ name: "Win32"
+ script:
+ - *ccache
+ - make --directory=src CCACHE=1 MINGW=1 PREFIX=i686-w64-mingw32
+
+build-x86_64-w64-mingw32:
+ <<: *job_build
+ artifacts:
+ paths:
+ - "bin/srb2win64.exe*"
+ name: "Win64"
+ script:
+ - *ccache
- make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
-
-
From bd1adb266771c7272e9b01edc9c8a5298a6c44de Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 04:22:15 +0000
Subject: [PATCH 044/115] Update .gitlab-ci.yml file inline the script to setup
ccache should be done in one line?
---
.gitlab-ci.yml | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88872359f..5c1f4a3ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,9 @@
stages: # List of stages for jobs, and their order of execution
- build
+.default_Scripts: &ccache
+ export CCACHE_BASEDIR="$PWD";export CCACHE_DIR="$PWD/ccache";export CCACHE_COMPILERCHECK=content
+
.job_template: &job_build # This job runs in the build stage, which runs first.
stage: build
image: debian:stable-slim
@@ -45,20 +48,13 @@ stages: # List of stages for jobs, and their order of execution
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache mingw-w64
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- - export CCACHE_BASEDIR="$PWD"
- - export CCACHE_DIR="$PWD/ccache"
+ - *ccache
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- - export CCACHE_BASEDIR="$PWD"
- - export CCACHE_DIR="$PWD/ccache"
+ - *ccache
- ccache --show-stats
-.default_Scripts: &ccache
- - export CCACHE_BASEDIR="$PWD"
- - export CCACHE_DIR="$PWD/ccache"
- - export CCACHE_COMPILERCHECK=content
-
build-x86_64-linux-gnu:
<<: *job_build
artifacts:
From ce760342c22e4a204408d6269268bcf4d7ee0059 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 04:26:02 +0000
Subject: [PATCH 045/115] Update .gitlab-ci.yml file fix setting $CC in
build-x86_64-linux-gnu job
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c1f4a3ee..5e0f91923 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,7 +63,7 @@ build-x86_64-linux-gnu:
name: "x86-64"
script:
- *ccache
- - export CC="x86_64-linux-gnu-gcc
+ - export CC="x86_64-linux-gnu-gcc"
- make --directory=src CCACHE=1 LINUX64=1
build-i686-w64-mingw32:
From 82b29bdfcf349795fafb28384b3d8b251d14a0f7 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 05:04:02 +0000
Subject: [PATCH 046/115] Update .gitlab-ci.yml file Name the artifacts by
project name,branch, then SHA
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e0f91923..f2c9573dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,7 +60,7 @@ build-x86_64-linux-gnu:
artifacts:
paths:
- "bin/lsdl2srb2*"
- name: "x86-64"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- *ccache
- export CC="x86_64-linux-gnu-gcc"
@@ -71,7 +71,7 @@ build-i686-w64-mingw32:
artifacts:
paths:
- "bin/srb2win.exe*"
- name: "Win32"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- *ccache
- make --directory=src CCACHE=1 MINGW=1 PREFIX=i686-w64-mingw32
@@ -81,7 +81,7 @@ build-x86_64-w64-mingw32:
artifacts:
paths:
- "bin/srb2win64.exe*"
- name: "Win64"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- *ccache
- make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
From ea02f5c8104ea3b157323835131240113156b28b Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 05:22:42 +0000
Subject: [PATCH 047/115] Update .gitlab-ci.yml file since each build job run
in their own docker, only install packages as needed for each job
---
.gitlab-ci.yml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2c9573dc..63fcb805b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ stages: # List of stages for jobs, and their order of execution
- apt-get update
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes build-essential libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev git libopenmpt-dev gettext ccache mingw-w64
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes make git ccache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- *ccache
- ccache --zero-stats || true
@@ -63,6 +63,8 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- *ccache
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev gcc
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- export CC="x86_64-linux-gnu-gcc"
- make --directory=src CCACHE=1 LINUX64=1
@@ -74,6 +76,8 @@ build-i686-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- *ccache
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- make --directory=src CCACHE=1 MINGW=1 PREFIX=i686-w64-mingw32
build-x86_64-w64-mingw32:
@@ -84,4 +88,6 @@ build-x86_64-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- *ccache
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64-x86-64
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
From caf2b486c4716f68e7e03d2bd065091ab92deb7c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 05:31:31 +0000
Subject: [PATCH 048/115] Update .gitlab-ci.yml file do not install posix
version of mingw-w64
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 63fcb805b..4498c1d85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,7 +76,7 @@ build-i686-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- *ccache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64-win32
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- make --directory=src CCACHE=1 MINGW=1 PREFIX=i686-w64-mingw32
@@ -88,6 +88,6 @@ build-x86_64-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- *ccache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64-x86-64
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64-x86-64-win32
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
From 567565968d0487e57ab04ca865cc38f52da54024 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 05:38:11 +0000
Subject: [PATCH 049/115] Update .gitlab-ci.yml file use
gcc-mingw-w64-(i686|x86-64)-win32 package
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4498c1d85..805ad781c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,7 +76,7 @@ build-i686-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- *ccache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64-win32
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64-i686-win32
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- make --directory=src CCACHE=1 MINGW=1 PREFIX=i686-w64-mingw32
From 50c32451fb9b0353667c74c01109e615da14dee9 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 12:55:10 +0000
Subject: [PATCH 050/115] Update .gitlab-ci.yml file Try to build i686 linux
binaries
---
.gitlab-ci.yml | 50 ++++++++++++++++++++++++++++++++++++--------------
1 file changed, 36 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 805ad781c..97ec84372 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,13 +16,18 @@
# This specific template is located at:
# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml
-
-
stages: # List of stages for jobs, and their order of execution
- build
-.default_Scripts: &ccache
- export CCACHE_BASEDIR="$PWD";export CCACHE_DIR="$PWD/ccache";export CCACHE_COMPILERCHECK=content
+.ccache_Scripts: &ccache
+ - export CCACHE_BASEDIR="$PWD"
+ - export CCACHE_DIR="$PWD/ccache"
+ - export CCACHE_COMPILERCHECK=content
+
+.aptcache_Scripts: &aptcache
+ - export APT_CACHE_DIR=`pwd`/apt-cache
+ - mkdir --parents --verbose $APT_CACHE_DIR/partial/
+
.job_template: &job_build # This job runs in the build stage, which runs first.
stage: build
@@ -43,18 +48,34 @@ stages: # List of stages for jobs, and their order of execution
- apt-cache
unprotect: true
before_script:
+ - dpkg --add-architecture i386
+ - dpkg --add-architecture amd64
- apt-get update
- - export APT_CACHE_DIR=`pwd`/apt-cache
- - mkdir --parents --verbose $APT_CACHE_DIR/partial/
+ - *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes make git ccache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- *ccache
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
+ - *aptcache
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- *ccache
- ccache --show-stats
+build-i686-linux-gnu:
+ <<: *job_build
+ artifacts:
+ paths:
+ - "bin/lsdl2srb2*"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
+ script:
+ - *aptcache
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
+ - export CC="i686-linux-gnu-gcc"
+ - *ccache
+ - make --directory=src CCACHE=1 LINUX=1
+
build-x86_64-linux-gnu:
<<: *job_build
artifacts:
@@ -62,10 +83,11 @@ build-x86_64-linux-gnu:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- - *ccache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
+ - *aptcache
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-x86-64-linux-gnu
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- export CC="x86_64-linux-gnu-gcc"
+ - *ccache
- make --directory=src CCACHE=1 LINUX64=1
build-i686-w64-mingw32:
@@ -75,9 +97,9 @@ build-i686-w64-mingw32:
- "bin/srb2win.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- - *ccache
+ - *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64-i686-win32
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
+ - *ccache
- make --directory=src CCACHE=1 MINGW=1 PREFIX=i686-w64-mingw32
build-x86_64-w64-mingw32:
@@ -87,7 +109,7 @@ build-x86_64-w64-mingw32:
- "bin/srb2win64.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- - *ccache
+ - *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64-x86-64-win32
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
+ - *ccache
- make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
From 83628d6049b00c5e01b48de191d54eb65288bd2c Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 13:11:16 +0000
Subject: [PATCH 051/115] Update .gitlab-ci.yml file Set PKG_CONFIG_PATH for
targeted archs
---
.gitlab-ci.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97ec84372..76d62bab5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ stages: # List of stages for jobs, and their order of execution
- dpkg --add-architecture amd64
- apt-get update
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes make git ccache
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes make git ccache gcc
- *ccache
- ccache --zero-stats || true
- ccache --show-stats || true
@@ -70,9 +70,10 @@ build-i686-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu || true
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- export CC="i686-linux-gnu-gcc"
+ - export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- *ccache
- make --directory=src CCACHE=1 LINUX=1
@@ -84,9 +85,10 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-x86-64-linux-gnu
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-x86-64-linux-gnu || true
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- export CC="x86_64-linux-gnu-gcc"
+ - export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- *ccache
- make --directory=src CCACHE=1 LINUX64=1
From 7ba7c5e6a0f101538dfa2513a41d6d07239fe45e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 16:17:10 +0000
Subject: [PATCH 052/115] Update .gitlab-ci.yml file Add build for ARM64
---
.gitlab-ci.yml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76d62bab5..83320aac1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,6 +77,21 @@ build-i686-linux-gnu:
- *ccache
- make --directory=src CCACHE=1 LINUX=1
+build-aarch64-linux-gnu:
+ <<: *job_build
+ artifacts:
+ paths:
+ - "bin/lsdl2srb2*"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
+ script:
+ - *aptcache
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-aarch64-linux-gnu || true
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
+ - export CC="aarch64-linux-gnu-gcc"
+ - export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+ - *ccache
+ - make --directory=src CCACHE=1 LINUX64=1 NONX86=1
+
build-x86_64-linux-gnu:
<<: *job_build
artifacts:
From f5cf1ce5a5ab7f6fe7256cb20ba985b4cc35e3d4 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 16:53:32 +0000
Subject: [PATCH 053/115] Update .gitlab-ci.yml file Forget to add arm64 arch
to the Debian system
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83320aac1..00072725b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,7 @@ stages: # List of stages for jobs, and their order of execution
before_script:
- dpkg --add-architecture i386
- dpkg --add-architecture amd64
+ - dpkg --add-architecture arm64
- apt-get update
- *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes make git ccache gcc
From 88ec9233b5973fe102f201bbfb4b9d517188e0ec Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 17:36:37 +0000
Subject: [PATCH 054/115] Update .gitlab-ci.yml file Overwrite OBJCOPY and
OBJDUMP settings for Linux targets
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00072725b..5828037ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,7 +76,7 @@ build-i686-linux-gnu:
- export CC="i686-linux-gnu-gcc"
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX=1
+ - make --directory=src CCACHE=1 LINUX=1 OBJCOPY=i686-linux-gnu-objcopy OBJDUMP=i686-linux-gnu-objdump
build-aarch64-linux-gnu:
<<: *job_build
@@ -91,7 +91,7 @@ build-aarch64-linux-gnu:
- export CC="aarch64-linux-gnu-gcc"
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX64=1 NONX86=1
+ - make --directory=src CCACHE=1 LINUX64=1 NONX86=1 OBJCOPY=aarch64-linux-gnu-objcopy OBJDUMP=aarch64-linux-gnu-objdump
build-x86_64-linux-gnu:
<<: *job_build
@@ -106,7 +106,7 @@ build-x86_64-linux-gnu:
- export CC="x86_64-linux-gnu-gcc"
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX64=1
+ - make --directory=src CCACHE=1 LINUX64=1 OBJCOPY=x86_64-linux-gnu-objcopy OBJDUMP=x86_64-linux-gnu-objdump
build-i686-w64-mingw32:
<<: *job_build
From fa76733feeffb1184413e2dcd310449596e3fe23 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 18:01:44 +0000
Subject: [PATCH 055/115] Update .gitlab-ci.yml file let see if the Makefile
system will just read from env
---
.gitlab-ci.yml | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5828037ac..681c6e61f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,10 +73,12 @@ build-i686-linux-gnu:
- *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu || true
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- - export CC="i686-linux-gnu-gcc"
+ - export CC=i686-linux-gnu-gcc
+ - export OBJCOPY=i686-linux-gnu-objcopy
+ - export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX=1 OBJCOPY=i686-linux-gnu-objcopy OBJDUMP=i686-linux-gnu-objdump
+ - make --directory=src CCACHE=1 LINUX=1
build-aarch64-linux-gnu:
<<: *job_build
@@ -88,10 +90,12 @@ build-aarch64-linux-gnu:
- *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-aarch64-linux-gnu || true
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- - export CC="aarch64-linux-gnu-gcc"
+ - export CC=aarch64-linux-gnu-gcc
+ - export OBJCOPY=aarch64-linux-gnu-objcopy
+ - export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX64=1 NONX86=1 OBJCOPY=aarch64-linux-gnu-objcopy OBJDUMP=aarch64-linux-gnu-objdump
+ - make --directory=src CCACHE=1 LINUX64=1 NONX86=1
build-x86_64-linux-gnu:
<<: *job_build
@@ -103,10 +107,12 @@ build-x86_64-linux-gnu:
- *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-x86-64-linux-gnu || true
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- - export CC="x86_64-linux-gnu-gcc"
+ - export CC=x86_64-linux-gnu-gcc
+ - export OBJCOPY=x86_64-linux-gnu-objcopy
+ - export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX64=1 OBJCOPY=x86_64-linux-gnu-objcopy OBJDUMP=x86_64-linux-gnu-objdump
+ - make --directory=src CCACHE=1 LINUX64=1
build-i686-w64-mingw32:
<<: *job_build
From fe65f2b27150afb550919e7429574967a2c36e66 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 18:12:23 +0000
Subject: [PATCH 056/115] Update cpdebug.mk Allow Env to overwrite Makefile's
default OBJCOPY and OBJDUMP, just like CC
---
cpdebug.mk | 64 +++++++++++++++++++++++++++---------------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/cpdebug.mk b/cpdebug.mk
index 6baedf227..e7b076303 100644
--- a/cpdebug.mk
+++ b/cpdebug.mk
@@ -1,32 +1,32 @@
-#Add-on Makefile for wxDev-C++ project file
-ifdef ComSpec
-COMSPEC=$(ComSpec)
-endif
-ifdef COMSPEC
-OBJCOPY=objcopy.exe
-OBJDUMP=objdump.exe
-GZIP?=gzip.exe
-else
-OBJCOPY=objcopy
-OBJDUMP=objdump
-GZIP?=gzip
-endif
-DBGNAME=$(BIN).debug
-OBJDUMP_OPTS?=--wide --source --line-numbers
-GZIP_OPTS?=-9 -f -n
-GZIP_OPT2=$(GZIP_OPTS) --rsyncable
-UPX?=upx
-UPX_OPTS?=--best --preserve-build-id
-UPX_OPTS+=-q
-
-all-after:
- $(OBJDUMP) $(OBJDUMP_OPTS) "$(BIN)" > "$(DBGNAME).txt"
- $(OBJCOPY) $(BIN) $(DBGNAME)
- $(OBJCOPY) --strip-debug $(BIN)
- -$(OBJCOPY) --add-gnu-debuglink=$(DBGNAME) $(BIN)
- -$(GZIP) $(GZIP_OPTS) "$(DBGNAME).txt"
-ifndef COMSPEC
- -$(GZIP) $(GZIP_OPT2) "$(DBGNAME).txt"
-endif
- -$(UPX) $(UPX_OPTS) $(BIN)
-
+#Add-on Makefile for wxDev-C++ project file
+ifdef ComSpec
+COMSPEC=$(ComSpec)
+endif
+ifdef COMSPEC
+OBJCOPY?=objcopy.exe
+OBJDUMP?=objdump.exe
+GZIP?=gzip.exe
+else
+OBJCOPY?=objcopy
+OBJDUMP?=objdump
+GZIP?=gzip
+endif
+DBGNAME=$(BIN).debug
+OBJDUMP_OPTS?=--wide --source --line-numbers
+GZIP_OPTS?=-9 -f -n
+GZIP_OPT2=$(GZIP_OPTS) --rsyncable
+UPX?=upx
+UPX_OPTS?=--best --preserve-build-id
+UPX_OPTS+=-q
+
+all-after:
+ $(OBJDUMP) $(OBJDUMP_OPTS) "$(BIN)" > "$(DBGNAME).txt"
+ $(OBJCOPY) $(BIN) $(DBGNAME)
+ $(OBJCOPY) --strip-debug $(BIN)
+ -$(OBJCOPY) --add-gnu-debuglink=$(DBGNAME) $(BIN)
+ -$(GZIP) $(GZIP_OPTS) "$(DBGNAME).txt"
+ifndef COMSPEC
+ -$(GZIP) $(GZIP_OPT2) "$(DBGNAME).txt"
+endif
+ -$(UPX) $(UPX_OPTS) $(BIN)
+
From 5449ca2dbfb3ddaa3ee6336b7b461757bf93fdba Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 18:25:02 +0000
Subject: [PATCH 057/115] Update .gitlab-ci.yml file force the Makefile system
to use our cross-compile binutil package
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 681c6e61f..e2ec24996 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,7 @@ build-i686-linux-gnu:
- export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX=1
+ - make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX=1
build-aarch64-linux-gnu:
<<: *job_build
@@ -95,7 +95,7 @@ build-aarch64-linux-gnu:
- export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX64=1 NONX86=1
+ - make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX64=1 NONX86=1
build-x86_64-linux-gnu:
<<: *job_build
@@ -112,7 +112,7 @@ build-x86_64-linux-gnu:
- export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX64=1
+ - make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX64=1
build-i686-w64-mingw32:
<<: *job_build
From 4e2324216d6d3c276322fe4c4ef722221265c10f Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 19:40:35 -0400
Subject: [PATCH 058/115] Makefile Also allow overwrite of OBJCOPY, OBJDUMP and
WINDRES
---
.gitlab-ci.yml | 6 ++---
cpdebug.mk | 64 +++++++++++++++++++++++++-------------------------
src/Makefile | 6 ++---
3 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2ec24996..681c6e61f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,7 @@ build-i686-linux-gnu:
- export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX=1
+ - make --directory=src CCACHE=1 LINUX=1
build-aarch64-linux-gnu:
<<: *job_build
@@ -95,7 +95,7 @@ build-aarch64-linux-gnu:
- export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX64=1 NONX86=1
+ - make --directory=src CCACHE=1 LINUX64=1 NONX86=1
build-x86_64-linux-gnu:
<<: *job_build
@@ -112,7 +112,7 @@ build-x86_64-linux-gnu:
- export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX64=1
+ - make --directory=src CCACHE=1 LINUX64=1
build-i686-w64-mingw32:
<<: *job_build
diff --git a/cpdebug.mk b/cpdebug.mk
index e7b076303..75f08c66f 100644
--- a/cpdebug.mk
+++ b/cpdebug.mk
@@ -1,32 +1,32 @@
-#Add-on Makefile for wxDev-C++ project file
-ifdef ComSpec
-COMSPEC=$(ComSpec)
-endif
-ifdef COMSPEC
-OBJCOPY?=objcopy.exe
-OBJDUMP?=objdump.exe
-GZIP?=gzip.exe
-else
-OBJCOPY?=objcopy
-OBJDUMP?=objdump
-GZIP?=gzip
-endif
-DBGNAME=$(BIN).debug
-OBJDUMP_OPTS?=--wide --source --line-numbers
-GZIP_OPTS?=-9 -f -n
-GZIP_OPT2=$(GZIP_OPTS) --rsyncable
-UPX?=upx
-UPX_OPTS?=--best --preserve-build-id
-UPX_OPTS+=-q
-
-all-after:
- $(OBJDUMP) $(OBJDUMP_OPTS) "$(BIN)" > "$(DBGNAME).txt"
- $(OBJCOPY) $(BIN) $(DBGNAME)
- $(OBJCOPY) --strip-debug $(BIN)
- -$(OBJCOPY) --add-gnu-debuglink=$(DBGNAME) $(BIN)
- -$(GZIP) $(GZIP_OPTS) "$(DBGNAME).txt"
-ifndef COMSPEC
- -$(GZIP) $(GZIP_OPT2) "$(DBGNAME).txt"
-endif
- -$(UPX) $(UPX_OPTS) $(BIN)
-
+#Add-on Makefile for wxDev-C++ project file
+ifdef ComSpec
+COMSPEC=$(ComSpec)
+endif
+ifdef COMSPEC
+OBJCOPY?=objcopy.exe
+OBJDUMP?=objdump.exe
+GZIP?=gzip.exe
+else
+OBJCOPY?=objcopy
+OBJDUMP?=objdump
+GZIP?=gzip
+endif
+DBGNAME=$(BIN).debug
+OBJDUMP_OPTS?=--wide --source --line-numbers
+GZIP_OPTS?=-9 -f -n
+GZIP_OPT2=$(GZIP_OPTS) --rsyncable
+UPX?=upx
+UPX_OPTS?=--best --preserve-build-id
+UPX_OPTS+=-q
+
+all-after:
+ $(OBJDUMP) $(OBJDUMP_OPTS) "$(BIN)" > "$(DBGNAME).txt"
+ $(OBJCOPY) $(BIN) $(DBGNAME)
+ $(OBJCOPY) --strip-debug $(BIN)
+ -$(OBJCOPY) --add-gnu-debuglink=$(DBGNAME) $(BIN)
+ -$(GZIP) $(GZIP_OPTS) "$(DBGNAME).txt"
+ifndef COMSPEC
+ -$(GZIP) $(GZIP_OPT2) "$(DBGNAME).txt"
+endif
+ -$(UPX) $(UPX_OPTS) $(BIN)
+
diff --git a/src/Makefile b/src/Makefile
index 41cef2a17..539c2fa74 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -141,9 +141,9 @@ endif
OBJDUMP_OPTS?=--wide --source --line-numbers
-OBJCOPY:=$(call Prefix,objcopy)
-OBJDUMP:=$(call Prefix,objdump)
-WINDRES:=$(call Prefix,windres)
+OBJCOPY?=$(call Prefix,objcopy)
+OBJDUMP?=$(call Prefix,objdump)
+WINDRES?=$(call Prefix,windres)
GZIP?=gzip
GZIP_OPTS?=-9 -f -n
From 903792f1090f5c0f72bae544c1d63a93dc50c80d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 20:07:22 -0400
Subject: [PATCH 059/115] Update .gitlib-ci.yml Remove whitespace
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 681c6e61f..bad819d34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,6 @@ stages: # List of stages for jobs, and their order of execution
.aptcache_Scripts: &aptcache
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
-
.job_template: &job_build # This job runs in the build stage, which runs first.
stage: build
From 008efa9b0edc00dca994d55c3b11c4454e4bd4dc Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 02:08:53 +0000
Subject: [PATCH 060/115] Update .gitlab-ci.yml file We do not need to install
GCC for w64-mingw32 jobs
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bad819d34..aa63365a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ stages: # List of stages for jobs, and their order of execution
- dpkg --add-architecture arm64
- apt-get update
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes make git ccache gcc
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes make git ccache
- *ccache
- ccache --zero-stats || true
- ccache --show-stats || true
@@ -70,7 +70,7 @@ build-i686-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu || true
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
@@ -87,7 +87,7 @@ build-aarch64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-aarch64-linux-gnu || true
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-aarch64-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- export CC=aarch64-linux-gnu-gcc
- export OBJCOPY=aarch64-linux-gnu-objcopy
@@ -104,7 +104,7 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-x86-64-linux-gnu || true
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-x86-64-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- export CC=x86_64-linux-gnu-gcc
- export OBJCOPY=x86_64-linux-gnu-objcopy
From 4f116673f3e03ab0e95b4e8ca15577a6902467ab Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 22:26:43 -0400
Subject: [PATCH 061/115] Undo src/Makefile Let see, revert OBJCOPY,OBJDUMP and
WINDRES statements
---
src/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 539c2fa74..41cef2a17 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -141,9 +141,9 @@ endif
OBJDUMP_OPTS?=--wide --source --line-numbers
-OBJCOPY?=$(call Prefix,objcopy)
-OBJDUMP?=$(call Prefix,objdump)
-WINDRES?=$(call Prefix,windres)
+OBJCOPY:=$(call Prefix,objcopy)
+OBJDUMP:=$(call Prefix,objdump)
+WINDRES:=$(call Prefix,windres)
GZIP?=gzip
GZIP_OPTS?=-9 -f -n
From dfe181058033d4f5a94ae2433ffd1cef33d69149 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 22:30:26 -0400
Subject: [PATCH 062/115] Revert "Undo src/Makefile"
This reverts commit 4f116673f3e03ab0e95b4e8ca15577a6902467ab.
---
src/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 41cef2a17..539c2fa74 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -141,9 +141,9 @@ endif
OBJDUMP_OPTS?=--wide --source --line-numbers
-OBJCOPY:=$(call Prefix,objcopy)
-OBJDUMP:=$(call Prefix,objdump)
-WINDRES:=$(call Prefix,windres)
+OBJCOPY?=$(call Prefix,objcopy)
+OBJDUMP?=$(call Prefix,objdump)
+WINDRES?=$(call Prefix,windres)
GZIP?=gzip
GZIP_OPTS?=-9 -f -n
From 5acceaa2389b35307ecf973dcc0019426da198d2 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 02:46:00 +0000
Subject: [PATCH 063/115] Update .gitlab-ci.yml file Let see if we can pass an
option for what architecture we are installing for
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa63365a5..d5a92e5e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,7 +71,7 @@ build-i686-linux-gnu:
script:
- *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" --option APT::Architecture="i386" install --no-install-recommends --yes libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
- export OBJDUMP=i686-linux-gnu-objdump
@@ -88,7 +88,7 @@ build-aarch64-linux-gnu:
script:
- *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-aarch64-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" --option APT::Architecture="arm64" install --no-install-recommends --yes libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- export CC=aarch64-linux-gnu-gcc
- export OBJCOPY=aarch64-linux-gnu-objcopy
- export OBJDUMP=aarch64-linux-gnu-objdump
@@ -105,7 +105,7 @@ build-x86_64-linux-gnu:
script:
- *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-x86-64-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" --option APT::Architecture="amd64" install --no-install-recommends --yes libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- export CC=x86_64-linux-gnu-gcc
- export OBJCOPY=x86_64-linux-gnu-objcopy
- export OBJDUMP=x86_64-linux-gnu-objdump
From 8b33dd604b21b5c8e00082a50163df2e51ecb1b1 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 22:48:34 -0400
Subject: [PATCH 064/115] Revert "Update .gitlab-ci.yml file"
This reverts commit 5acceaa2389b35307ecf973dcc0019426da198d2.
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5a92e5e6..aa63365a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,7 +71,7 @@ build-i686-linux-gnu:
script:
- *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" --option APT::Architecture="i386" install --no-install-recommends --yes libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
- export OBJDUMP=i686-linux-gnu-objdump
@@ -88,7 +88,7 @@ build-aarch64-linux-gnu:
script:
- *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-aarch64-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" --option APT::Architecture="arm64" install --no-install-recommends --yes libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- export CC=aarch64-linux-gnu-gcc
- export OBJCOPY=aarch64-linux-gnu-objcopy
- export OBJDUMP=aarch64-linux-gnu-objdump
@@ -105,7 +105,7 @@ build-x86_64-linux-gnu:
script:
- *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-x86-64-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" --option APT::Architecture="amd64" install --no-install-recommends --yes libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- export CC=x86_64-linux-gnu-gcc
- export OBJCOPY=x86_64-linux-gnu-objcopy
- export OBJDUMP=x86_64-linux-gnu-objdump
From 0368a1ce8b95169d0663bb4ebdfc196273411fae Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 22:49:44 -0400
Subject: [PATCH 065/115] cleanup whitespace in .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa63365a5..f1ec1edab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,7 +71,7 @@ build-i686-linux-gnu:
script:
- *aptcache
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
- export OBJDUMP=i686-linux-gnu-objdump
From aa9d84b6d23d31f28474e86d05dad9b2f98a7c5d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 16:13:31 +0000
Subject: [PATCH 066/115] Update .gitlab-ci.yml file
Let try building on Debian Testing
---
.gitlab-ci.yml | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1ec1edab..cacb68744 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,9 +28,11 @@ stages: # List of stages for jobs, and their order of execution
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
-.job_template: &job_build # This job runs in the build stage, which runs first.
- stage: build
+default:
image: debian:stable-slim
+
+.job_template: &job_build # This job runs in the build stage, which runs first.
+ stage: build
variables:
CCACHE_MAXSIZE: "50M"
GIT_STRATEGY: clone
@@ -136,3 +138,18 @@ build-x86_64-w64-mingw32:
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64-x86-64-win32
- *ccache
- make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
+
+build-testing:
+ <<: *job_build
+ image: debian:testing-slim
+ allow_failure: true
+ artifacts:
+ paths:
+ - "bin/lsdl2srb2*"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
+ script:
+ - *aptcache
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
+ - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - *ccache
+ - make --directory=src CCACHE=1 NONX86=1
\ No newline at end of file
From f6d37d504b2eb73589dc99153b385454e3cd54a9 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 16:37:06 +0000
Subject: [PATCH 067/115] Update .gitlab-ci.yml file
quiet out the apt-get commands
---
.gitlab-ci.yml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cacb68744..927ad705e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,15 +52,15 @@ default:
- dpkg --add-architecture i386
- dpkg --add-architecture amd64
- dpkg --add-architecture arm64
- - apt-get update
+ - apt-get --quiet update
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes make git ccache
+ - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install make git ccache
- *ccache
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" autoclean
+ - apt-get --quiet --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- *ccache
- ccache --show-stats
@@ -72,8 +72,8 @@ build-i686-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
+ - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-i686-linux-gnu || apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
+ - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
- export OBJDUMP=i686-linux-gnu-objdump
@@ -89,8 +89,8 @@ build-aarch64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-aarch64-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
+ - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-aarch64-linux-gnu || apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
+ - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- export CC=aarch64-linux-gnu-gcc
- export OBJCOPY=aarch64-linux-gnu-objcopy
- export OBJDUMP=aarch64-linux-gnu-objdump
@@ -106,8 +106,8 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-x86-64-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
+ - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-x86-64-linux-gnu || apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
+ - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- export CC=x86_64-linux-gnu-gcc
- export OBJCOPY=x86_64-linux-gnu-objcopy
- export OBJDUMP=x86_64-linux-gnu-objdump
@@ -123,7 +123,7 @@ build-i686-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64-i686-win32
+ - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-i686-win32
- *ccache
- make --directory=src CCACHE=1 MINGW=1 PREFIX=i686-w64-mingw32
@@ -135,7 +135,7 @@ build-x86_64-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-mingw-w64-x86-64-win32
+ - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-x86-64-win32
- *ccache
- make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
@@ -149,7 +149,7 @@ build-testing:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
script:
- *aptcache
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
- - apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
+ - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- *ccache
- make --directory=src CCACHE=1 NONX86=1
\ No newline at end of file
From b8fb0280ab322a54ea7fa57873b0b383ed8660f1 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 16:45:02 +0000
Subject: [PATCH 068/115] Update .gitlab-ci.yml file
more quiet out the apt-get commands
---
.gitlab-ci.yml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 927ad705e..1efb639fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,15 +52,15 @@ default:
- dpkg --add-architecture i386
- dpkg --add-architecture amd64
- dpkg --add-architecture arm64
- - apt-get --quiet update
+ - apt-get --quiet --quiet update
- *aptcache
- - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install make git ccache
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install make git ccache
- *ccache
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- *aptcache
- - apt-get --quiet --option dir::cache::archives="$APT_CACHE_DIR" autoclean
+ - apt-get --quiet --quiet --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- *ccache
- ccache --show-stats
@@ -72,8 +72,8 @@ build-i686-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-i686-linux-gnu || apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-i686-linux-gnu || apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
- export OBJDUMP=i686-linux-gnu-objdump
@@ -89,8 +89,8 @@ build-aarch64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-aarch64-linux-gnu || apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-aarch64-linux-gnu || apt-get --no-install-recommend --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- export CC=aarch64-linux-gnu-gcc
- export OBJCOPY=aarch64-linux-gnu-objcopy
- export OBJDUMP=aarch64-linux-gnu-objdump
@@ -106,8 +106,8 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-x86-64-linux-gnu || apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-x86-64-linux-gnu || apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- export CC=x86_64-linux-gnu-gcc
- export OBJCOPY=x86_64-linux-gnu-objcopy
- export OBJDUMP=x86_64-linux-gnu-objdump
@@ -123,7 +123,7 @@ build-i686-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-i686-win32
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-i686-win32
- *ccache
- make --directory=src CCACHE=1 MINGW=1 PREFIX=i686-w64-mingw32
@@ -135,7 +135,7 @@ build-x86_64-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-x86-64-win32
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-x86-64-win32
- *ccache
- make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
@@ -149,7 +149,7 @@ build-testing:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- - apt-get --no-install-recommends --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- *ccache
- make --directory=src CCACHE=1 NONX86=1
\ No newline at end of file
From a6038dd6f2a226cd439c3bfb750b4308caaeae92 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 19:49:43 +0000
Subject: [PATCH 069/115] Update detect.mk
Add support for GCC 13.2
---
src/Makefile.d/detect.mk | 215 ++++++++++++++++++++-------------------
1 file changed, 109 insertions(+), 106 deletions(-)
diff --git a/src/Makefile.d/detect.mk b/src/Makefile.d/detect.mk
index aca498721..4719d6593 100644
--- a/src/Makefile.d/detect.mk
+++ b/src/Makefile.d/detect.mk
@@ -1,106 +1,109 @@
-#
-# Detect the host system and compiler version.
-#
-
-# Previously featured:\
- PANDORA\
- HAIKU\
- DUMMY\
- DJGPPDOS\
- SOLARIS\
- MACOSX\
-
-all_systems:=\
- LINUX64\
- MINGW64\
- MINGW\
- UNIX\
- LINUX\
- FREEBSD\
-
-# check for user specified system
-ifeq (,$(filter $(all_systems),$(.VARIABLES)))
-ifeq ($(OS),Windows_NT) # all windows are Windows_NT...
-
-_m=Detected a Windows system,\
- compiling for 32-bit MinGW SDL...)
-$(call Print,$(_m))
-
-# go for a 32-bit sdl mingw exe by default
-MINGW:=1
-
-else # if you on the *nix
-
-system:=$(shell uname -s)
-
-ifeq ($(system),Linux)
-new_system:=LINUX
-else
-
-$(error \
- Could not automatically detect your system,\
- try specifying a system manually)
-
-endif
-
-ifeq ($(shell getconf LONG_BIT),64)
-system+=64-bit
-new_system:=$(new_system)64
-endif
-
-$(call Print,Detected $(system) ($(new_system))...)
-$(new_system):=1
-
-endif
-endif
-
-# This must have high to low order.
-gcc_versions:=\
- 102 101\
- 93 92 91\
- 84 83 82 81\
- 75 74 73 72 71\
- 64 63 62 61\
- 55 54 53 52 51\
- 49 48 47 46 45 44 43 42 41 40
-
-latest_gcc_version:=10.2
-
-# Automatically set version flag, but not if one was
-# manually set. And don't bother if this is a clean only
-# run.
-ifeq (,$(call Wildvar,GCC% destructive))
-
-# can't use $(CC) --version here since that uses argv[0] to display the name
-# also gcc outputs the information to stderr, so I had to do 2>&1
-# this program really doesn't like identifying itself
-version:=$(shell $(CC) -v 2>&1)
-
-# check if this is in fact GCC
-ifneq (,$(findstring gcc version,$(version)))
-
-# in stark contrast to the name, gcc will give me a nicely formatted version number for free
-version:=$(shell $(CC) -dumpfullversion)
-
-# Turn version into words of major, minor
-v:=$(subst ., ,$(version))
-# concat. major minor
-v:=$(word 1,$(v))$(word 2,$(v))
-
-# If this version is not in the list,
-# default to the latest supported
-ifeq (,$(filter $(v),$(gcc_versions)))
-define line =
-Your compiler version, GCC $(version), \
-is not supported by the Makefile.
-The Makefile will assume GCC $(latest_gcc_version).
-endef
-$(call Print,$(line))
-GCC$(subst .,,$(latest_gcc_version)):=1
-else
-$(call Print,Detected GCC $(version) (GCC$(v)))
-GCC$(v):=1
-endif
-
-endif
-endif
+#
+# Detect the host system and compiler version.
+#
+
+# Previously featured:\
+ PANDORA\
+ HAIKU\
+ DUMMY\
+ DJGPPDOS\
+ SOLARIS\
+ MACOSX\
+
+all_systems:=\
+ LINUX64\
+ MINGW64\
+ MINGW\
+ UNIX\
+ LINUX\
+ FREEBSD\
+
+# check for user specified system
+ifeq (,$(filter $(all_systems),$(.VARIABLES)))
+ifeq ($(OS),Windows_NT) # all windows are Windows_NT...
+
+_m=Detected a Windows system,\
+ compiling for 32-bit MinGW SDL...)
+$(call Print,$(_m))
+
+# go for a 32-bit sdl mingw exe by default
+MINGW:=1
+
+else # if you on the *nix
+
+system:=$(shell uname -s)
+
+ifeq ($(system),Linux)
+new_system:=LINUX
+else
+
+$(error \
+ Could not automatically detect your system,\
+ try specifying a system manually)
+
+endif
+
+ifeq ($(shell getconf LONG_BIT),64)
+system+=64-bit
+new_system:=$(new_system)64
+endif
+
+$(call Print,Detected $(system) ($(new_system))...)
+$(new_system):=1
+
+endif
+endif
+
+# This must have high to low order.
+gcc_versions:=\
+ 132 131\
+ 123 122 121\
+ 114 113 112 111\
+ 105 104 103 102 101\
+ 95 94 93 92 91\
+ 85 84 83 82 81\
+ 75 74 73 72 71\
+ 64 63 62 61\
+ 55 54 53 52 51\
+ 49 48 47 46 45 44 43 42 41 40
+
+latest_gcc_version:=13.2
+
+# Automatically set version flag, but not if one was
+# manually set. And don't bother if this is a clean only
+# run.
+ifeq (,$(call Wildvar,GCC% destructive))
+
+# can't use $(CC) --version here since that uses argv[0] to display the name
+# also gcc outputs the information to stderr, so I had to do 2>&1
+# this program really doesn't like identifying itself
+version:=$(shell $(CC) -v 2>&1)
+
+# check if this is in fact GCC
+ifneq (,$(findstring gcc version,$(version)))
+
+# in stark contrast to the name, gcc will give me a nicely formatted version number for free
+version:=$(shell $(CC) -dumpfullversion)
+
+# Turn version into words of major, minor
+v:=$(subst ., ,$(version))
+# concat. major minor
+v:=$(word 1,$(v))$(word 2,$(v))
+
+# If this version is not in the list,
+# default to the latest supported
+ifeq (,$(filter $(v),$(gcc_versions)))
+define line =
+Your compiler version, GCC $(version), \
+is not supported by the Makefile.
+The Makefile will assume GCC $(latest_gcc_version).
+endef
+$(call Print,$(line))
+GCC$(subst .,,$(latest_gcc_version)):=1
+else
+$(call Print,Detected GCC $(version) (GCC$(v)))
+GCC$(v):=1
+endif
+
+endif
+endif
From fb299dd63e6f4cb0067538ee07807e13db118c8d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 20:09:00 +0000
Subject: [PATCH 070/115] Update .gitlab-ci.yml file
Make the buildbot yell at us for warnings
---
.gitlab-ci.yml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1efb639fb..ec1e7dc0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,6 +54,7 @@ default:
- dpkg --add-architecture arm64
- apt-get --quiet --quiet update
- *aptcache
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install apt-utils
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install make git ccache
- *ccache
- ccache --zero-stats || true
@@ -79,7 +80,7 @@ build-i686-linux-gnu:
- export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
build-aarch64-linux-gnu:
<<: *job_build
@@ -96,7 +97,7 @@ build-aarch64-linux-gnu:
- export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX64=1 NONX86=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
build-x86_64-linux-gnu:
<<: *job_build
@@ -113,7 +114,7 @@ build-x86_64-linux-gnu:
- export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX64=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
build-i686-w64-mingw32:
<<: *job_build
@@ -125,7 +126,7 @@ build-i686-w64-mingw32:
- *aptcache
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-i686-win32
- *ccache
- - make --directory=src CCACHE=1 MINGW=1 PREFIX=i686-w64-mingw32
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
build-x86_64-w64-mingw32:
<<: *job_build
@@ -137,7 +138,7 @@ build-x86_64-w64-mingw32:
- *aptcache
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-x86-64-win32
- *ccache
- - make --directory=src CCACHE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
build-testing:
<<: *job_build
@@ -152,4 +153,4 @@ build-testing:
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- *ccache
- - make --directory=src CCACHE=1 NONX86=1
\ No newline at end of file
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
\ No newline at end of file
From af020810bf0a1a500222a01e674c2a6a7fbe656f Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 17:02:33 -0400
Subject: [PATCH 071/115] fix compiling for GCC 11+
---
src/Makefile.d/detect.mk | 4 ++--
src/p_map.c | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.d/detect.mk b/src/Makefile.d/detect.mk
index 4719d6593..ab6268757 100644
--- a/src/Makefile.d/detect.mk
+++ b/src/Makefile.d/detect.mk
@@ -57,8 +57,8 @@ endif
# This must have high to low order.
gcc_versions:=\
132 131\
- 123 122 121\
- 114 113 112 111\
+ 123 122 121\
+ 114 113 112 111\
105 104 103 102 101\
95 94 93 92 91\
85 84 83 82 81\
diff --git a/src/p_map.c b/src/p_map.c
index 80135db74..a9d2cf45d 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -3732,6 +3732,8 @@ void P_SlideMove(mobj_t *mo)
vertex_t v1, v2; // fake vertexes
line_t junk; // fake linedef
+ memset(&junk, 1, sizeof(junk));
+
if (tmhitthing && mo->z + mo->height > tmhitthing->z && mo->z < tmhitthing->z + tmhitthing->height)
{
// Don't mess with your momentum if it's a pushable object. Pushables do their own crazy things already.
From 796adec979834ca55ba2d2fa547fe8b4105800ce Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 21:40:41 +0000
Subject: [PATCH 072/115] Update .gitlab-ci.yml file
Retry building so we point out why it failed to compile
---
.gitlab-ci.yml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec1e7dc0a..4d59ef1a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ default:
CCACHE_MAXSIZE: "50M"
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
+ ENV DEBIAN_FRONTEND: noninteractive
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
fallback_keys:
@@ -80,7 +81,7 @@ build-i686-linux-gnu:
- export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- *ccache
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
build-aarch64-linux-gnu:
<<: *job_build
@@ -97,7 +98,7 @@ build-aarch64-linux-gnu:
- export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
build-x86_64-linux-gnu:
<<: *job_build
@@ -114,7 +115,7 @@ build-x86_64-linux-gnu:
- export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
build-i686-w64-mingw32:
<<: *job_build
@@ -126,7 +127,7 @@ build-i686-w64-mingw32:
- *aptcache
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-i686-win32
- *ccache
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
build-x86_64-w64-mingw32:
<<: *job_build
@@ -138,7 +139,7 @@ build-x86_64-w64-mingw32:
- *aptcache
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-x86-64-win32
- *ccache
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
build-testing:
<<: *job_build
@@ -153,4 +154,4 @@ build-testing:
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- *ccache
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
\ No newline at end of file
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
\ No newline at end of file
From 96beee1d4d61c8b6cd1413db8a6e8c4b5f80acbf Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 21:43:15 +0000
Subject: [PATCH 073/115] Update .gitlab-ci.yml file
set DEBIAN_FRONTEND envvar in aptcache
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d59ef1a6..347aeea94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,7 @@ stages: # List of stages for jobs, and their order of execution
.aptcache_Scripts: &aptcache
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
+ - export DEBIAN_FRONTEND=noninteractive
default:
image: debian:stable-slim
@@ -37,7 +38,6 @@ default:
CCACHE_MAXSIZE: "50M"
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
- ENV DEBIAN_FRONTEND: noninteractive
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
fallback_keys:
From 1bf78686e27fb61449ea652a9bdc70f9c0cb8754 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 19:33:31 -0400
Subject: [PATCH 074/115] let not pass a point of a temp stack var around
---
src/p_map.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/p_map.c b/src/p_map.c
index a9d2cf45d..2911e4d40 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -3730,7 +3730,7 @@ void P_SlideMove(mobj_t *mo)
boolean papercol = false;
vertex_t v1, v2; // fake vertexes
- line_t junk; // fake linedef
+ static line_t junk; // fake linedef
memset(&junk, 1, sizeof(junk));
From fc586b5c62bf34212b51dc245427f33c204e4607 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 23:46:44 +0000
Subject: [PATCH 075/115] Update .gitlab-ci.yml file
Build in the following order: testing, win32, amd64, i386, arm64 then win64
---
.gitlab-ci.yml | 90 +++++++++++++++++++++++++-------------------------
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 347aeea94..9f3229d5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,50 @@ default:
- *ccache
- ccache --show-stats
+build-testing:
+ <<: *job_build
+ image: debian:testing-slim
+ allow_failure: true
+ artifacts:
+ paths:
+ - "bin/lsdl2srb2*"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
+ script:
+ - *aptcache
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - *ccache
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
+
+build-i686-w64-mingw32:
+ <<: *job_build
+ artifacts:
+ paths:
+ - "bin/srb2win.exe*"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
+ script:
+ - *aptcache
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-i686-win32
+ - *ccache
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
+
+build-x86_64-linux-gnu:
+ <<: *job_build
+ artifacts:
+ paths:
+ - "bin/lsdl2srb2*"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
+ script:
+ - *aptcache
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-x86-64-linux-gnu || apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
+ - export CC=x86_64-linux-gnu-gcc
+ - export OBJCOPY=x86_64-linux-gnu-objcopy
+ - export OBJDUMP=x86_64-linux-gnu-objdump
+ - export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
+ - *ccache
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
+
build-i686-linux-gnu:
<<: *job_build
artifacts:
@@ -100,35 +144,6 @@ build-aarch64-linux-gnu:
- *ccache
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
-build-x86_64-linux-gnu:
- <<: *job_build
- artifacts:
- paths:
- - "bin/lsdl2srb2*"
- name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
- script:
- - *aptcache
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-x86-64-linux-gnu || apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- - export CC=x86_64-linux-gnu-gcc
- - export OBJCOPY=x86_64-linux-gnu-objcopy
- - export OBJDUMP=x86_64-linux-gnu-objdump
- - export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- - *ccache
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
-
-build-i686-w64-mingw32:
- <<: *job_build
- artifacts:
- paths:
- - "bin/srb2win.exe*"
- name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
- script:
- - *aptcache
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-i686-win32
- - *ccache
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
-
build-x86_64-w64-mingw32:
<<: *job_build
artifacts:
@@ -139,19 +154,4 @@ build-x86_64-w64-mingw32:
- *aptcache
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-x86-64-win32
- *ccache
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
-
-build-testing:
- <<: *job_build
- image: debian:testing-slim
- allow_failure: true
- artifacts:
- paths:
- - "bin/lsdl2srb2*"
- name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
- script:
- - *aptcache
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- - *ccache
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
\ No newline at end of file
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
\ No newline at end of file
From 8f00667abec65a57f3b2a5581b9bbf42536d2846 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 20:10:34 -0400
Subject: [PATCH 076/115] Update src/Makefile.d/*.mk
both Makefile and *.mk should be in the same EOL
---
.gitattributes | 4 +-
.gitlab-ci.yml | 4 +-
src/Makefile.d/detect.mk | 218 ++++++++++++++++++-------------------
src/Makefile.d/features.mk | 136 +++++++++++------------
4 files changed, 182 insertions(+), 180 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index 7751149ac..c2e507352 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,15 +1,17 @@
#Source code
+/Makefile text=auto
/src/*.c text=auto
/src/*.h text=auto
/src/*.s text=auto
/src/*.m text=auto
/src/*.xpm text=auto
/src/Makefile text=auto
+/tools/Makefile text=auto
/src/Make*.cfg text=auto
/src/CMakeLists.txt text=auto
+*.mk -whitespace text=auto
# Windows EOL
*.cs -crlf -whitespace
-*.mk -crlf -whitespace
*.bat -crlf -whitespace
*.dev -crlf -whitespace
*.dsp -crlf -whitespace
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f3229d5c..7ea13db6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ default:
image: debian:stable-slim
.job_template: &job_build # This job runs in the build stage, which runs first.
- stage: build
+ stage: build
variables:
CCACHE_MAXSIZE: "50M"
GIT_STRATEGY: clone
@@ -154,4 +154,4 @@ build-x86_64-w64-mingw32:
- *aptcache
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-x86-64-win32
- *ccache
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
\ No newline at end of file
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
diff --git a/src/Makefile.d/detect.mk b/src/Makefile.d/detect.mk
index ab6268757..0cd618c69 100644
--- a/src/Makefile.d/detect.mk
+++ b/src/Makefile.d/detect.mk
@@ -1,109 +1,109 @@
-#
-# Detect the host system and compiler version.
-#
-
-# Previously featured:\
- PANDORA\
- HAIKU\
- DUMMY\
- DJGPPDOS\
- SOLARIS\
- MACOSX\
-
-all_systems:=\
- LINUX64\
- MINGW64\
- MINGW\
- UNIX\
- LINUX\
- FREEBSD\
-
-# check for user specified system
-ifeq (,$(filter $(all_systems),$(.VARIABLES)))
-ifeq ($(OS),Windows_NT) # all windows are Windows_NT...
-
-_m=Detected a Windows system,\
- compiling for 32-bit MinGW SDL...)
-$(call Print,$(_m))
-
-# go for a 32-bit sdl mingw exe by default
-MINGW:=1
-
-else # if you on the *nix
-
-system:=$(shell uname -s)
-
-ifeq ($(system),Linux)
-new_system:=LINUX
-else
-
-$(error \
- Could not automatically detect your system,\
- try specifying a system manually)
-
-endif
-
-ifeq ($(shell getconf LONG_BIT),64)
-system+=64-bit
-new_system:=$(new_system)64
-endif
-
-$(call Print,Detected $(system) ($(new_system))...)
-$(new_system):=1
-
-endif
-endif
-
-# This must have high to low order.
-gcc_versions:=\
- 132 131\
- 123 122 121\
- 114 113 112 111\
- 105 104 103 102 101\
- 95 94 93 92 91\
- 85 84 83 82 81\
- 75 74 73 72 71\
- 64 63 62 61\
- 55 54 53 52 51\
- 49 48 47 46 45 44 43 42 41 40
-
-latest_gcc_version:=13.2
-
-# Automatically set version flag, but not if one was
-# manually set. And don't bother if this is a clean only
-# run.
-ifeq (,$(call Wildvar,GCC% destructive))
-
-# can't use $(CC) --version here since that uses argv[0] to display the name
-# also gcc outputs the information to stderr, so I had to do 2>&1
-# this program really doesn't like identifying itself
-version:=$(shell $(CC) -v 2>&1)
-
-# check if this is in fact GCC
-ifneq (,$(findstring gcc version,$(version)))
-
-# in stark contrast to the name, gcc will give me a nicely formatted version number for free
-version:=$(shell $(CC) -dumpfullversion)
-
-# Turn version into words of major, minor
-v:=$(subst ., ,$(version))
-# concat. major minor
-v:=$(word 1,$(v))$(word 2,$(v))
-
-# If this version is not in the list,
-# default to the latest supported
-ifeq (,$(filter $(v),$(gcc_versions)))
-define line =
-Your compiler version, GCC $(version), \
-is not supported by the Makefile.
-The Makefile will assume GCC $(latest_gcc_version).
-endef
-$(call Print,$(line))
-GCC$(subst .,,$(latest_gcc_version)):=1
-else
-$(call Print,Detected GCC $(version) (GCC$(v)))
-GCC$(v):=1
-endif
-
-endif
-endif
+#
+# Detect the host system and compiler version.
+#
+
+# Previously featured:\
+ PANDORA\
+ HAIKU\
+ DUMMY\
+ DJGPPDOS\
+ SOLARIS\
+ MACOSX\
+
+all_systems:=\
+ LINUX64\
+ MINGW64\
+ MINGW\
+ UNIX\
+ LINUX\
+ FREEBSD\
+
+# check for user specified system
+ifeq (,$(filter $(all_systems),$(.VARIABLES)))
+ifeq ($(OS),Windows_NT) # all windows are Windows_NT...
+
+_m=Detected a Windows system,\
+ compiling for 32-bit MinGW SDL...)
+$(call Print,$(_m))
+
+# go for a 32-bit sdl mingw exe by default
+MINGW:=1
+
+else # if you on the *nix
+
+system:=$(shell uname -s)
+
+ifeq ($(system),Linux)
+new_system:=LINUX
+else
+
+$(error \
+ Could not automatically detect your system,\
+ try specifying a system manually)
+
+endif
+
+ifeq ($(shell getconf LONG_BIT),64)
+system+=64-bit
+new_system:=$(new_system)64
+endif
+
+$(call Print,Detected $(system) ($(new_system))...)
+$(new_system):=1
+
+endif
+endif
+
+# This must have high to low order.
+gcc_versions:=\
+ 132 131\
+ 123 122 121\
+ 114 113 112 111\
+ 105 104 103 102 101\
+ 95 94 93 92 91\
+ 85 84 83 82 81\
+ 75 74 73 72 71\
+ 64 63 62 61\
+ 55 54 53 52 51\
+ 49 48 47 46 45 44 43 42 41 40
+
+latest_gcc_version:=13.2
+
+# Automatically set version flag, but not if one was
+# manually set. And don't bother if this is a clean only
+# run.
+ifeq (,$(call Wildvar,GCC% destructive))
+
+# can't use $(CC) --version here since that uses argv[0] to display the name
+# also gcc outputs the information to stderr, so I had to do 2>&1
+# this program really doesn't like identifying itself
+version:=$(shell $(CC) -v 2>&1)
+
+# check if this is in fact GCC
+ifneq (,$(findstring gcc version,$(version)))
+
+# in stark contrast to the name, gcc will give me a nicely formatted version number for free
+version:=$(shell $(CC) -dumpfullversion)
+
+# Turn version into words of major, minor
+v:=$(subst ., ,$(version))
+# concat. major minor
+v:=$(word 1,$(v))$(word 2,$(v))
+
+# If this version is not in the list,
+# default to the latest supported
+ifeq (,$(filter $(v),$(gcc_versions)))
+define line =
+Your compiler version, GCC $(version), \
+is not supported by the Makefile.
+The Makefile will assume GCC $(latest_gcc_version).
+endef
+$(call Print,$(line))
+GCC$(subst .,,$(latest_gcc_version)):=1
+else
+$(call Print,Detected GCC $(version) (GCC$(v)))
+GCC$(v):=1
+endif
+
+endif
+endif
diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk
index 1787f94cb..653100cb5 100644
--- a/src/Makefile.d/features.mk
+++ b/src/Makefile.d/features.mk
@@ -1,68 +1,68 @@
-#
-# Makefile for feature flags.
-#
-
-passthru_opts+=\
- NONET NO_IPV6 NOHW NOMD5 NOPOSTPROCESSING\
- MOBJCONSISTANCY PACKETDROP ZDEBUG\
- HAVE_MINIUPNPC\
-
-# build with debugging information
-ifdef DEBUGMODE
-PACKETDROP=1
-opts+=-DPARANOIA -DRANGECHECK
-endif
-
-ifndef NOHW
-opts+=-DHWRENDER
-sources+=$(call List,hardware/Sourcefile)
-endif
-
-ifndef NOMD5
-sources+=md5.c
-endif
-
-ifndef NOZLIB
-ifndef NOPNG
-ifdef PNG_PKGCONFIG
-$(eval $(call Use_pkg_config,PNG_PKGCONFIG))
-else
-PNG_CONFIG?=$(call Prefix,libpng-config)
-$(eval $(call Configure,PNG,$(PNG_CONFIG) \
- $(if $(PNG_STATIC),--static),,--ldflags))
-endif
-ifdef LINUX
-opts+=-D_LARGEFILE64_SOURCE
-endif
-opts+=-DHAVE_PNG
-sources+=apng.c
-endif
-endif
-
-ifndef NONET
-ifndef NOCURL
-CURLCONFIG?=curl-config
-$(eval $(call Configure,CURL,$(CURLCONFIG)))
-opts+=-DHAVE_CURL
-endif
-endif
-
-ifdef HAVE_MINIUPNPC
-libs+=-lminiupnpc
-endif
-
-# (Valgrind is a memory debugger.)
-ifdef VALGRIND
-VALGRIND_PKGCONFIG?=valgrind
-$(eval $(call Use_pkg_config,VALGRIND))
-ZDEBUG=1
-opts+=-DHAVE_VALGRIND
-endif
-
-default_packages:=\
- GME/libgme/LIBGME\
- OPENMPT/libopenmpt/LIBOPENMPT\
- ZLIB/zlib\
-
-$(foreach p,$(default_packages),\
- $(eval $(call Check_pkg_config,$(p))))
+#
+# Makefile for feature flags.
+#
+
+passthru_opts+=\
+ NONET NO_IPV6 NOHW NOMD5 NOPOSTPROCESSING\
+ MOBJCONSISTANCY PACKETDROP ZDEBUG\
+ HAVE_MINIUPNPC\
+
+# build with debugging information
+ifdef DEBUGMODE
+PACKETDROP=1
+opts+=-DPARANOIA -DRANGECHECK
+endif
+
+ifndef NOHW
+opts+=-DHWRENDER
+sources+=$(call List,hardware/Sourcefile)
+endif
+
+ifndef NOMD5
+sources+=md5.c
+endif
+
+ifndef NOZLIB
+ifndef NOPNG
+ifdef PNG_PKGCONFIG
+$(eval $(call Use_pkg_config,PNG_PKGCONFIG))
+else
+PNG_CONFIG?=$(call Prefix,libpng-config)
+$(eval $(call Configure,PNG,$(PNG_CONFIG) \
+ $(if $(PNG_STATIC),--static),,--ldflags))
+endif
+ifdef LINUX
+opts+=-D_LARGEFILE64_SOURCE
+endif
+opts+=-DHAVE_PNG
+sources+=apng.c
+endif
+endif
+
+ifndef NONET
+ifndef NOCURL
+CURLCONFIG?=curl-config
+$(eval $(call Configure,CURL,$(CURLCONFIG)))
+opts+=-DHAVE_CURL
+endif
+endif
+
+ifdef HAVE_MINIUPNPC
+libs+=-lminiupnpc
+endif
+
+# (Valgrind is a memory debugger.)
+ifdef VALGRIND
+VALGRIND_PKGCONFIG?=valgrind
+$(eval $(call Use_pkg_config,VALGRIND))
+ZDEBUG=1
+opts+=-DHAVE_VALGRIND
+endif
+
+default_packages:=\
+ GME/libgme/LIBGME\
+ OPENMPT/libopenmpt/LIBOPENMPT\
+ ZLIB/zlib\
+
+$(foreach p,$(default_packages),\
+ $(eval $(call Check_pkg_config,$(p))))
From d3d3ee54519660a74de6161cb0c90140b9ec1642 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 01:37:05 +0000
Subject: [PATCH 077/115] Update .gitlab-ci.yml file
Try to keep a stats log of ccache
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ea13db6a..b0f82607c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,7 @@ stages: # List of stages for jobs, and their order of execution
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
+ - export CCACHE_STATSLOG=CCACHE_DIR="$PWD/ccache_statslog"
.aptcache_Scripts: &aptcache
- export APT_CACHE_DIR=`pwd`/apt-cache
@@ -35,7 +36,7 @@ default:
.job_template: &job_build # This job runs in the build stage, which runs first.
stage: build
variables:
- CCACHE_MAXSIZE: "50M"
+ CCACHE_MAXSIZE: 50M
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
cache:
@@ -65,6 +66,7 @@ default:
- apt-get --quiet --quiet --option dir::cache::archives="$APT_CACHE_DIR" autoclean
- *ccache
- ccache --show-stats
+ - ccache --show-log-stats || true
build-testing:
<<: *job_build
From 2fe5755f531f13c9689aac1ba727aa842bdfba1f Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 01:44:23 +0000
Subject: [PATCH 078/115] Update .gitlab-ci.yml file
Fix CCACHE_STATSLOG?
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0f82607c..ccf190781 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,8 @@ stages: # List of stages for jobs, and their order of execution
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
- - export CCACHE_STATSLOG=CCACHE_DIR="$PWD/ccache_statslog"
+ - export CCACHE_STATS=true
+ - export CCACHE_STATSLOG="$PWD/ccache_statslog"
.aptcache_Scripts: &aptcache
- export APT_CACHE_DIR=`pwd`/apt-cache
From 98fd34e76c843f248de13a898b1912cdce20a95b Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 02:11:52 +0000
Subject: [PATCH 079/115] Update .gitlab-ci.yml file
save ccache_statslog between runs?
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccf190781..82c851601 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,6 +47,7 @@ default:
- cache-$CI_PROJECT_PATH_SLUG-default
paths:
- ccache
+ - ccache_statslog
- key: apt-$CI_JOB_IMAGE
paths:
- apt-cache
From 8533955da808295bfa0825ec8d932e0225f2f944 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 13 Oct 2023 22:50:19 -0400
Subject: [PATCH 080/115] Update src/p_map.c
it seems line_t have pointers, clear all of it
---
src/p_map.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/p_map.c b/src/p_map.c
index 2911e4d40..251837876 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -3732,7 +3732,7 @@ void P_SlideMove(mobj_t *mo)
vertex_t v1, v2; // fake vertexes
static line_t junk; // fake linedef
- memset(&junk, 1, sizeof(junk));
+ memset(&junk, 0x00, sizeof(junk));
if (tmhitthing && mo->z + mo->height > tmhitthing->z && mo->z < tmhitthing->z + tmhitthing->height)
{
From b469064e40290850c8e660e30f8f33697cfc6d85 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 03:11:56 +0000
Subject: [PATCH 081/115] Update .gitlab-ci.yml file
remove double space
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82c851601..4eb4b48f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,7 +139,7 @@ build-aarch64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-aarch64-linux-gnu || apt-get --no-install-recommend --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
+ - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-aarch64-linux-gnu || apt-get --no-install-recommend --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- export CC=aarch64-linux-gnu-gcc
- export OBJCOPY=aarch64-linux-gnu-objcopy
From d659ce563ccbd239abbf38a1598538f3b184c4cc Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 11:40:25 +0000
Subject: [PATCH 082/115] Update .gitlab-ci.yml file
Set common apt settings to /etc/apt/apt.conf.d/99build
---
.gitlab-ci.yml | 55 +++++++++++++++++++-------------------------------
1 file changed, 21 insertions(+), 34 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4eb4b48f4..754da90a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,3 @@
-# This file is a template, and might need editing before it works on your project.
-# This is a sample GitLab CI/CD configuration file that should run without any modifications.
-# It demonstrates a basic 3 stage CI/CD pipeline. Instead of real tests or scripts,
-# it uses echo commands to simulate the pipeline execution.
-#
-# A pipeline is composed of independent jobs that run scripts, grouped into stages.
-# Stages run in sequential order, but jobs within stages run in parallel.
-#
-# For more information, see: https://docs.gitlab.com/ee/ci/yaml/index.html#stages
-#
-# You can copy and paste this template into a new `.gitlab-ci.yml` file.
-# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword.
-#
-# To contribute improvements to CI/CD templates, please follow the Development guide at:
-# https://docs.gitlab.com/ee/development/cicd/templates.html
-# This specific template is located at:
-# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml
-
stages: # List of stages for jobs, and their order of execution
- build
@@ -23,12 +5,10 @@ stages: # List of stages for jobs, and their order of execution
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export CCACHE_COMPILERCHECK=content
- - export CCACHE_STATS=true
- export CCACHE_STATSLOG="$PWD/ccache_statslog"
.aptcache_Scripts: &aptcache
- export APT_CACHE_DIR=`pwd`/apt-cache
- - mkdir --parents --verbose $APT_CACHE_DIR/partial/
- export DEBIAN_FRONTEND=noninteractive
default:
@@ -56,16 +36,23 @@ default:
- dpkg --add-architecture i386
- dpkg --add-architecture amd64
- dpkg --add-architecture arm64
- - apt-get --quiet --quiet update
- *aptcache
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install apt-utils
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install make git ccache
+ - touch /etc/apt/apt.conf.d/99build
+ - echo Adding options to apt.conf':'
+ - echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build
+ - echo quiet "2"\; | tee --append /etc/apt/apt.conf.d/99build
+ - echo APT::Get::Assume-Yes "true"\; | tee --append /etc/apt/apt.conf.d/99build
+ - echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
+ - apt-get update
+ - mkdir --parents --verbose $APT_CACHE_DIR/partial/
+ - apt-get install apt-utils
+ - apt-get install make git ccache
- *ccache
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- *aptcache
- - apt-get --quiet --quiet --option dir::cache::archives="$APT_CACHE_DIR" autoclean
+ - apt-get autoclean
- *ccache
- ccache --show-stats
- ccache --show-log-stats || true
@@ -80,8 +67,8 @@ build-testing:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - apt-get install gcc
+ - apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- *ccache
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
@@ -93,7 +80,7 @@ build-i686-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-i686-win32
+ - apt-get install gcc-mingw-w64-i686-win32
- *ccache
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
@@ -105,8 +92,8 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-x86-64-linux-gnu || apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
+ - apt-get install gcc-x86-64-linux-gnu || apt-get gcc
+ - apt-get libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- export CC=x86_64-linux-gnu-gcc
- export OBJCOPY=x86_64-linux-gnu-objcopy
- export OBJDUMP=x86_64-linux-gnu-objdump
@@ -122,8 +109,8 @@ build-i686-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-i686-linux-gnu || apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
+ - apt-get gcc-i686-linux-gnu || apt-get install gcc
+ - apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
- export OBJDUMP=i686-linux-gnu-objdump
@@ -139,8 +126,8 @@ build-aarch64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-aarch64-linux-gnu || apt-get --no-install-recommend --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
+ - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
+ - apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- export CC=aarch64-linux-gnu-gcc
- export OBJCOPY=aarch64-linux-gnu-objcopy
- export OBJDUMP=aarch64-linux-gnu-objdump
@@ -156,6 +143,6 @@ build-x86_64-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- *aptcache
- - apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-x86-64-win32
+ - apt-get install gcc-mingw-w64-x86-64-win32
- *ccache
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
From 52e4ed33af2bbdc8328c41d2885b7bd382fdb88b Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 11:54:16 +0000
Subject: [PATCH 083/115] Update .gitlab-ci.yml file
Fix install command for GCC in build jobs
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 754da90a1..e10ad1bd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,8 +92,8 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- *aptcache
- - apt-get install gcc-x86-64-linux-gnu || apt-get gcc
- - apt-get libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
+ - apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
+ - apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- export CC=x86_64-linux-gnu-gcc
- export OBJCOPY=x86_64-linux-gnu-objcopy
- export OBJDUMP=x86_64-linux-gnu-objdump
@@ -109,7 +109,7 @@ build-i686-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- *aptcache
- - apt-get gcc-i686-linux-gnu || apt-get install gcc
+ - apt-get install gcc-i686-linux-gnu || apt-get install gcc
- apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
From 806c8f259cb8cbec347ef5f1c4e59d138131e559 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 08:23:03 -0400
Subject: [PATCH 084/115] Update src/Makefile.d/detect.mk
Support Mingw64 toolchain versions
---
src/Makefile.d/detect.mk | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/Makefile.d/detect.mk b/src/Makefile.d/detect.mk
index 0cd618c69..9e2736946 100644
--- a/src/Makefile.d/detect.mk
+++ b/src/Makefile.d/detect.mk
@@ -56,15 +56,15 @@ endif
# This must have high to low order.
gcc_versions:=\
- 132 131\
- 123 122 121\
- 114 113 112 111\
- 105 104 103 102 101\
- 95 94 93 92 91\
- 85 84 83 82 81\
- 75 74 73 72 71\
- 64 63 62 61\
- 55 54 53 52 51\
+ 132 131 130\
+ 123 122 121 120\
+ 114 113 112 111 110\
+ 105 104 103 102 101 100\
+ 95 94 93 92 91 90\
+ 85 84 83 82 81 80\
+ 75 74 73 72 71 70\
+ 64 63 62 61 60\
+ 55 54 53 52 51 50\
49 48 47 46 45 44 43 42 41 40
latest_gcc_version:=13.2
@@ -77,13 +77,18 @@ ifeq (,$(call Wildvar,GCC% destructive))
# can't use $(CC) --version here since that uses argv[0] to display the name
# also gcc outputs the information to stderr, so I had to do 2>&1
# this program really doesn't like identifying itself
-version:=$(shell $(CC) -v 2>&1)
+shellversion:=$(shell $(CC) -v 2>&1)
+# Try to remove "-win32"
+version:=$(subst -win32,.0,$(shellversion))
# check if this is in fact GCC
ifneq (,$(findstring gcc version,$(version)))
# in stark contrast to the name, gcc will give me a nicely formatted version number for free
-version:=$(shell $(CC) -dumpfullversion)
+shellversion:=$(shell $(CC) -dumpfullversion)
+
+# Try to remove "-win32"
+version:=$(subst -win32,.0,$(shellversion))
# Turn version into words of major, minor
v:=$(subst ., ,$(version))
From ff3993257a46bc1f913a28015015b9d62dc94904 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 13:01:32 +0000
Subject: [PATCH 085/115] Update .gitlab-ci.yml file
place sections around "apt-get install" and "make" commands
---
.gitlab-ci.yml | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e10ad1bd5..c35824c8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,8 +45,12 @@ default:
- echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
- apt-get update
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0Kinstalling pre packages"
- apt-get install apt-utils
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0Kinstalling common packages "
- apt-get install make git ccache
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
- *ccache
- ccache --zero-stats || true
- ccache --show-stats || true
@@ -67,10 +71,16 @@ build-testing:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
script:
- *aptcache
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- apt-get install gcc
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- *ccache
+ - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-w64-mingw32:
<<: *job_build
@@ -80,9 +90,13 @@ build-i686-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- *aptcache
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages
- apt-get install gcc-mingw-w64-i686-win32
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- *ccache
+ - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-linux-gnu:
<<: *job_build
@@ -92,14 +106,20 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- *aptcache
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- export CC=x86_64-linux-gnu-gcc
- export OBJCOPY=x86_64-linux-gnu-objcopy
- export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- *ccache
+ - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-linux-gnu:
<<: *job_build
@@ -109,14 +129,20 @@ build-i686-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- *aptcache
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
- export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- *ccache
+ - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-aarch64-linux-gnu:
<<: *job_build
@@ -126,14 +152,20 @@ build-aarch64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- *aptcache
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- export CC=aarch64-linux-gnu-gcc
- export OBJCOPY=aarch64-linux-gnu-objcopy
- export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- *ccache
+ - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-w64-mingw32:
<<: *job_build
@@ -143,6 +175,10 @@ build-x86_64-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- *aptcache
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages
- apt-get install gcc-mingw-w64-x86-64-win32
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- *ccache
+ - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
From 1a0fad75f9014bd1b169ad0429c68f0eeca97d77 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 13:09:59 +0000
Subject: [PATCH 086/115] Update .gitlab-ci.yml file
fixup EOL on section commands
---
.gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c35824c8c..e65a6f41e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,7 +90,7 @@ build-i686-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- apt-get install gcc-mingw-w64-i686-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- *ccache
@@ -106,7 +106,7 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
@@ -129,7 +129,7 @@ build-i686-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
@@ -152,7 +152,7 @@ build-aarch64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
@@ -175,7 +175,7 @@ build-x86_64-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- apt-get install gcc-mingw-w64-x86-64-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- *ccache
From c17c5327a8ba7247aef0f93446ac766d91d2ceff Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 13:11:49 +0000
Subject: [PATCH 087/115] Update .gitlab-ci.yml file
remove extra space
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e65a6f41e..203f44fdb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ default:
- echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0Kinstalling pre packages"
- apt-get install apt-utils
- echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0Kinstalling common packages "
+ - echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0Kinstalling common packages"
- apt-get install make git ccache
- echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
- *ccache
From 1886b9f9458e503eb05436b549501186822daa2e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 14:18:23 +0000
Subject: [PATCH 088/115] Update .gitlab-ci.yml file
Add more sections to the build log
---
.gitlab-ci.yml | 178 ++++++++++++++++++++++++++-----------------------
1 file changed, 95 insertions(+), 83 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 203f44fdb..333ab25ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,9 @@
stages: # List of stages for jobs, and their order of execution
- build
-.ccache_Scripts: &ccache
- - export CCACHE_BASEDIR="$PWD"
- - export CCACHE_DIR="$PWD/ccache"
- - export CCACHE_COMPILERCHECK=content
- - export CCACHE_STATSLOG="$PWD/ccache_statslog"
-
.aptcache_Scripts: &aptcache
- - export APT_CACHE_DIR=`pwd`/apt-cache
- - export DEBIAN_FRONTEND=noninteractive
+ export APT_CACHE_DIR=`pwd`/apt-cache;
+ export DEBIAN_FRONTEND=noninteractive;
default:
image: debian:stable-slim
@@ -17,7 +11,6 @@ default:
.job_template: &job_build # This job runs in the build stage, which runs first.
stage: build
variables:
- CCACHE_MAXSIZE: 50M
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
cache:
@@ -33,31 +26,56 @@ default:
- apt-cache
unprotect: true
before_script:
- - dpkg --add-architecture i386
- - dpkg --add-architecture amd64
- - dpkg --add-architecture arm64
- - *aptcache
- - touch /etc/apt/apt.conf.d/99build
- - echo Adding options to apt.conf':'
- - echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build
- - echo quiet "2"\; | tee --append /etc/apt/apt.conf.d/99build
- - echo APT::Get::Assume-Yes "true"\; | tee --append /etc/apt/apt.conf.d/99build
- - echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
- - apt-get update
- - mkdir --parents --verbose $APT_CACHE_DIR/partial/
- - echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0Kinstalling pre packages"
- - apt-get install apt-utils
- - echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0Kinstalling common packages"
- - apt-get install make git ccache
- - echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
- - *ccache
+ - - echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
+ - dpkg --add-architecture i386
+ - dpkg --add-architecture amd64
+ - dpkg --add-architecture arm64
+ - echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
+
+ - - echo -e "\e[0Ksection_start:`date +%s`:ac_pre[collapsed=true]\r\e[0KSetting up APT cache"
+ - *aptcache
+ - echo -e "\e[0Ksection_end:`date +%s`:ac_pre\r\e[0K"
+
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
+ - touch /etc/apt/apt.conf.d/99build
+ - echo Adding options to apt.conf':'
+ - echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build
+ - echo quiet "1"\; | tee --append /etc/apt/apt.conf.d/99build
+ - echo APT::Get::Assume-Yes "true"\; | tee --append /etc/apt/apt.conf.d/99build
+ - echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
+
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
+ - apt-get update
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
+
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_cache[collapsed=true]\r\e[0KMaking APT cache directory"
+ - mkdir --parents --verbose $APT_CACHE_DIR/partial/
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_cache\r\e[0K"
+
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
+ - apt-get install apt-utils
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
+
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
+ - apt-get install make git ccache
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
+
+ - - echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
+ - echo Adding ccache configution option
+ - touch ~/.ccache/ccache.conf
+ - echo base_dir = "$PWD" | tee ~/.ccache/ccache.conf
+ - echo cache_dir = "$PWD/ccache" | tee ~/.ccache/ccache.conf
+ - echo compiler_check = content | tee ~/.ccache/ccache.conf
+ - echo stats_log = "$PWD/ccache_statslog" | tee ~/.ccache/ccache.conf
+ - echo max_size = 50M | tee ~/.ccache/ccache.conf
+ - echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
+
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- *aptcache
- apt-get autoclean
- - *ccache
- ccache --show-stats
- ccache --show-log-stats || true
@@ -71,16 +89,15 @@ build-testing:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
script:
- *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- - apt-get install gcc
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- - apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - *ccache
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - apt-get install gcc
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
+ - apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-w64-mingw32:
<<: *job_build
@@ -90,13 +107,12 @@ build-i686-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- - apt-get install gcc-mingw-w64-i686-win32
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - *ccache
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - apt-get install gcc-mingw-w64-i686-win32
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-linux-gnu:
<<: *job_build
@@ -106,20 +122,19 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- - apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- - apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
+ - apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- export CC=x86_64-linux-gnu-gcc
- export OBJCOPY=x86_64-linux-gnu-objcopy
- export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- - *ccache
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-linux-gnu:
<<: *job_build
@@ -129,20 +144,19 @@ build-i686-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- - apt-get install gcc-i686-linux-gnu || apt-get install gcc
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- - apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - apt-get install gcc-i686-linux-gnu || apt-get install gcc
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
+ - apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
- export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- - *ccache
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-aarch64-linux-gnu:
<<: *job_build
@@ -152,20 +166,19 @@ build-aarch64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- - apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
+ - apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- export CC=aarch64-linux-gnu-gcc
- export OBJCOPY=aarch64-linux-gnu-objcopy
- export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- - *ccache
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-w64-mingw32:
<<: *job_build
@@ -175,10 +188,9 @@ build-x86_64-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
- - apt-get install gcc-mingw-w64-x86-64-win32
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - *ccache
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - apt-get install gcc-mingw-w64-x86-64-win32
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
+ - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
From 2e4d5b6fa9d31b761546ef56c575cff435521eb3 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 14:29:57 +0000
Subject: [PATCH 089/115] Update .gitlab-ci.yml file
mkdir ~/.ccache before make the config file
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 333ab25ba..5447fe7f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,6 +63,7 @@ default:
- - echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
- echo Adding ccache configution option
+ - mkdir --parents --verbose ~/.ccache
- touch ~/.ccache/ccache.conf
- echo base_dir = "$PWD" | tee ~/.ccache/ccache.conf
- echo cache_dir = "$PWD/ccache" | tee ~/.ccache/ccache.conf
From e6044ec9f10888d9b47fb486c46aa060567b3746 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 15:05:50 +0000
Subject: [PATCH 090/115] Update .gitlab-ci.yml file
append, not overwrite ccache.conf
---
.gitlab-ci.yml | 43 +++++++++++++++++++++++++++++--------------
1 file changed, 29 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5447fe7f8..d8a6f4247 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,20 +63,22 @@ default:
- - echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
- echo Adding ccache configution option
- - mkdir --parents --verbose ~/.ccache
- touch ~/.ccache/ccache.conf
- - echo base_dir = "$PWD" | tee ~/.ccache/ccache.conf
- - echo cache_dir = "$PWD/ccache" | tee ~/.ccache/ccache.conf
- - echo compiler_check = content | tee ~/.ccache/ccache.conf
- - echo stats_log = "$PWD/ccache_statslog" | tee ~/.ccache/ccache.conf
- - echo max_size = 50M | tee ~/.ccache/ccache.conf
+ - echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf
+ - echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf
+ - echo compiler_check = content | tee --append ~/.ccache/ccache.conf
+ - echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
+ - echo max_size = 50M | tee --append ~/.ccache/ccache.conf
- echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- - *aptcache
- - apt-get autoclean
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
+ - *aptcache
+ - apt-get autoclean
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
+
- ccache --show-stats
- ccache --show-log-stats || true
@@ -89,13 +91,15 @@ build-testing:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
script:
- - *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - *aptcache
- apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -107,10 +111,11 @@ build-i686-w64-mingw32:
- "bin/srb2win.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- - *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - *aptcache
- apt-get install gcc-mingw-w64-i686-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -122,17 +127,20 @@ build-x86_64-linux-gnu:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- - *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - *aptcache
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
- export CC=x86_64-linux-gnu-gcc
- export OBJCOPY=x86_64-linux-gnu-objcopy
- export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
+
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -144,17 +152,20 @@ build-i686-linux-gnu:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- - *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - *aptcache
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
- export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
+
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -166,17 +177,20 @@ build-aarch64-linux-gnu:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- - *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - *aptcache
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
- export CC=aarch64-linux-gnu-gcc
- export OBJCOPY=aarch64-linux-gnu-objcopy
- export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -188,10 +202,11 @@ build-x86_64-w64-mingw32:
- "bin/srb2win64.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- - *aptcache
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - *aptcache
- apt-get install gcc-mingw-w64-x86-64-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
From dee306c58b71a25aa25b2dc171d024637a37afad Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 15:25:04 +0000
Subject: [PATCH 091/115] Update .gitlab-ci.yml file
I need to make the .ccache folder
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8a6f4247..a196ce281 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,6 +63,7 @@ default:
- - echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
- echo Adding ccache configution option
+ - mkdir --parents --verbose ~/.ccache/
- touch ~/.ccache/ccache.conf
- echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf
- echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf
From c74711fefa1f4233ee444dfa51bc9e04801c89f9 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 19:51:11 +0000
Subject: [PATCH 092/115] Update .gitlab-ci.yml file
section off ccache output
---
.gitlab-ci.yml | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a196ce281..ea0d6668f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,16 +72,20 @@ default:
- echo max_size = 50M | tee --append ~/.ccache/ccache.conf
- echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
- - ccache --zero-stats || true
- - ccache --show-stats || true
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_reset[collapsed=true]\r\e[0KResetting ccache statistics"
+ - ccache --zero-stats || true
+ - ccache --show-stats || true
+ - echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
after_script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
- *aptcache
- apt-get autoclean
- echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
- - ccache --show-stats
- - ccache --show-log-stats || true
+ - - echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=false]\r\e[0Kccache statistics:"
+ - ccache --show-stats --verbose
+ - ccache --show-log-stats --verbose || true
+ - echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
build-testing:
<<: *job_build
@@ -92,12 +96,12 @@ build-testing:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- *aptcache
- apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
@@ -112,7 +116,7 @@ build-i686-w64-mingw32:
- "bin/srb2win.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- *aptcache
- apt-get install gcc-mingw-w64-i686-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -128,12 +132,12 @@ build-x86_64-linux-gnu:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- *aptcache
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
@@ -153,12 +157,12 @@ build-i686-linux-gnu:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- *aptcache
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
@@ -178,12 +182,12 @@ build-aarch64-linux-gnu:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- *aptcache
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
@@ -203,7 +207,7 @@ build-x86_64-w64-mingw32:
- "bin/srb2win64.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0Kinstalling toolchain packages"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- *aptcache
- apt-get install gcc-mingw-w64-x86-64-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
From 50d8cb4c00de891b8d13a06e36b6104a241a7f81 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 14 Oct 2023 21:08:13 +0000
Subject: [PATCH 093/115] Update .gitlab-ci.yml file
hide ccache statistics
---
.gitlab-ci.yml | 45 +++++++++++++++------------------------------
1 file changed, 15 insertions(+), 30 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea0d6668f..206d1d888 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,6 @@
stages: # List of stages for jobs, and their order of execution
- build
-.aptcache_Scripts: &aptcache
- export APT_CACHE_DIR=`pwd`/apt-cache;
- export DEBIAN_FRONTEND=noninteractive;
-
default:
image: debian:stable-slim
@@ -13,6 +9,7 @@ default:
variables:
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
+ DEBIAN_FRONTEND: noninteractive
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
fallback_keys:
@@ -32,27 +29,21 @@ default:
- dpkg --add-architecture arm64
- echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:ac_pre[collapsed=true]\r\e[0KSetting up APT cache"
- - *aptcache
- - echo -e "\e[0Ksection_end:`date +%s`:ac_pre\r\e[0K"
-
- - echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
+ - export APT_CACHE_DIR=`pwd`/apt-cache
- touch /etc/apt/apt.conf.d/99build
- echo Adding options to apt.conf':'
- echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build
- echo quiet "1"\; | tee --append /etc/apt/apt.conf.d/99build
- echo APT::Get::Assume-Yes "true"\; | tee --append /etc/apt/apt.conf.d/99build
- echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
+ - mkdir --parents --verbose $APT_CACHE_DIR/partial/
- echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
- apt-get update
- echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_cache[collapsed=true]\r\e[0KMaking APT cache directory"
- - mkdir --parents --verbose $APT_CACHE_DIR/partial/
- - echo -e "\e[0Ksection_end:`date +%s`:apt_cache\r\e[0K"
-
- - echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
- apt-get install apt-utils
- echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
@@ -72,19 +63,19 @@ default:
- echo max_size = 50M | tee --append ~/.ccache/ccache.conf
- echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_reset[collapsed=true]\r\e[0KResetting ccache statistics"
- - ccache --zero-stats || true
- - ccache --show-stats || true
+ - - echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
+ - ccache --zero-stats
+ - ccache --show-stats
- echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
+
after_script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
- - *aptcache
- apt-get autoclean
- echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=false]\r\e[0Kccache statistics:"
+ - - echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
- ccache --show-stats --verbose
- - ccache --show-log-stats --verbose || true
+ - ccache --show-log-stats --verbose
- echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
build-testing:
@@ -97,7 +88,6 @@ build-testing:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -105,7 +95,7 @@ build-testing:
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -117,11 +107,10 @@ build-i686-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc-mingw-w64-i686-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -133,7 +122,6 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -146,7 +134,7 @@ build-x86_64-linux-gnu:
- export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -158,7 +146,6 @@ build-i686-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -171,7 +158,7 @@ build-i686-linux-gnu:
- export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -183,7 +170,6 @@ build-aarch64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -196,7 +182,7 @@ build-aarch64-linux-gnu:
- export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -208,10 +194,9 @@ build-x86_64-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc-mingw-w64-x86-64-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
From 49041773124b8e1c7fa1be5fe6ca9e91df551ffc Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 04:34:39 +0000
Subject: [PATCH 094/115] Update .gitlab-ci.yml file
Move the exports to variables section
---
.gitlab-ci.yml | 50 +++++++++++++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 21 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 206d1d888..eb0c60a54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,8 @@ default:
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
DEBIAN_FRONTEND: noninteractive
+ CCACHE: 1
+ ERRORMODE: 1
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
fallback_keys:
@@ -86,6 +88,8 @@ build-testing:
paths:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
+ variables:
+ CC: gcc
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc
@@ -96,7 +100,7 @@ build-testing:
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
+ - make --directory=src --keep-going NONX86=1 || make --directory=src --keep-going NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-w64-mingw32:
@@ -105,13 +109,15 @@ build-i686-w64-mingw32:
paths:
- "bin/srb2win.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
+ variables:
+ PREFIX: i686-w64-mingw32
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-i686-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
+ - make --directory=src --keep-going MINGW=1 || make --directory=src --keep-going MINGW=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-linux-gnu:
@@ -120,6 +126,11 @@ build-x86_64-linux-gnu:
paths:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
+ variables:
+ CC: x86_64-linux-gnu-gcc
+ OBJCOPY: x86_64-linux-gnu-objcopy
+ OBJDUMP: x86_64-linux-gnu-objdump
+ PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
@@ -129,13 +140,8 @@ build-x86_64-linux-gnu:
- apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - export CC=x86_64-linux-gnu-gcc
- - export OBJCOPY=x86_64-linux-gnu-objcopy
- - export OBJDUMP=x86_64-linux-gnu-objdump
- - export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
-
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
+ - make --directory=src --keep-going LINUX64=1 || make --directory=src --keep-going LINUX64=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-linux-gnu:
@@ -144,6 +150,11 @@ build-i686-linux-gnu:
paths:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
+ variables:
+ CC: i686-linux-gnu-gcc
+ OBJCOPY: i686-linux-gnu-objcopy
+ OBJDUMP: i686-linux-gnu-objdump
+ PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
@@ -153,13 +164,8 @@ build-i686-linux-gnu:
- apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - export CC=i686-linux-gnu-gcc
- - export OBJCOPY=i686-linux-gnu-objcopy
- - export OBJDUMP=i686-linux-gnu-objdump
- - export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
-
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
+ - make --directory=src --keep-going LINUX=1 || make --directory=src --keep-going LINUX=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-aarch64-linux-gnu:
@@ -168,6 +174,11 @@ build-aarch64-linux-gnu:
paths:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
+ variables:
+ CC: aarch64-linux-gnu-gcc
+ OBJCOPY: aarch64-linux-gnu-objcopy
+ OBJDUMP: aarch64-linux-gnu-objdump
+ PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
@@ -177,13 +188,8 @@ build-aarch64-linux-gnu:
- apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - export CC=aarch64-linux-gnu-gcc
- - export OBJCOPY=aarch64-linux-gnu-objcopy
- - export OBJDUMP=aarch64-linux-gnu-objdump
- - export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
-
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
+ - make --directory=src --keep-going LINUX64=1 NONX86=1 || make --directory=src --keep-going LINUX64=1 NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-w64-mingw32:
@@ -192,11 +198,13 @@ build-x86_64-w64-mingw32:
paths:
- "bin/srb2win64.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
+ variables:
+ PREFIX: x86_64-w64-mingw32
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-x86-64-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
+ - make --directory=src --keep-going MINGW64=1 || make --directory=src --keep-going MINGW64=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
From de7f0cba1b82e6c9ad575fa7b350f5a6ca210f2a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 04:55:29 +0000
Subject: [PATCH 095/115] Update .gitlab-ci.yml file
Can not set CCACHE=1 in shell env
---
.gitlab-ci.yml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb0c60a54..306c6942a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,6 @@ default:
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
DEBIAN_FRONTEND: noninteractive
- CCACHE: 1
ERRORMODE: 1
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
@@ -100,7 +99,7 @@ build-testing:
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going NONX86=1 || make --directory=src --keep-going NONX86=1
+ - make --directory=src --keep-going CCACHE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-w64-mingw32:
@@ -117,7 +116,7 @@ build-i686-w64-mingw32:
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going MINGW=1 || make --directory=src --keep-going MINGW=1
+ - make --directory=src --keep-going CCACHE=1 MINGW=1 || make --directory=src --keep-going CCACHE=1 MINGW=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-linux-gnu:
@@ -141,7 +140,7 @@ build-x86_64-linux-gnu:
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going LINUX64=1 || make --directory=src --keep-going LINUX64=1
+ - make --directory=src --keep-going CCACHE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 LINUX64=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-linux-gnu:
@@ -165,7 +164,7 @@ build-i686-linux-gnu:
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going LINUX=1 || make --directory=src --keep-going LINUX=1
+ - make --directory=src --keep-going CCACHE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 LINUX=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-aarch64-linux-gnu:
@@ -189,7 +188,7 @@ build-aarch64-linux-gnu:
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going LINUX64=1 NONX86=1 || make --directory=src --keep-going LINUX64=1 NONX86=1
+ - make --directory=src --keep-going CCACHE=1 LINUX64=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 LINUX64=1 NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-w64-mingw32:
@@ -206,5 +205,5 @@ build-x86_64-w64-mingw32:
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going MINGW64=1 || make --directory=src --keep-going MINGW64=1
+ - make --directory=src --keep-going CCACHE=1 MINGW64=1 || make --directory=src --keep-going CCACHE=1 MINGW64=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
From 8ace36efbf6477617bfa0a572df3a0d789e52d09 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 14:44:17 +0000
Subject: [PATCH 096/115] Update .gitlab-ci.yml file
Try to list packages that can be upgraded
---
.gitlab-ci.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 306c6942a..f7fdc1826 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,10 @@ default:
variables:
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
- DEBIAN_FRONTEND: noninteractive
+ DEBIAN_FRONTEND: "noninteractive"
+ DEBIAN_PRIORITY: "low"
+ DEBCONF_NOWARNINGS: "yes"
+ DEBCONF_NONINTERACTIVE_SEEN: "true"
ERRORMODE: 1
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
@@ -49,6 +52,10 @@ default:
- apt-get install apt-utils
- echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages (dry-run)"
+ - apt-get upgrade --simulate
+ - echo -e "\e[0Ksection_end:`date +%s`:apt_upgraden\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
- apt-get install make git ccache
- echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
From 595ce3e22534b097d22077fc0a4f1e23d6267177 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 16:08:15 +0000
Subject: [PATCH 097/115] Update .gitlab-ci.yml file
Update Debian image
---
.gitlab-ci.yml | 54 ++++++++++++++++++++++++++++++++++++++------------
1 file changed, 41 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7fdc1826..2582d0cd3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,16 +4,16 @@ stages: # List of stages for jobs, and their order of execution
default:
image: debian:stable-slim
+.debconf: &debconf
+ export DEBIAN_FRONTEND="noninteractive";
+ export DEBIAN_PRIORITY="low";
+ export DEBCONF_NONINTERACTIVE_SEEN="true";
+
.job_template: &job_build # This job runs in the build stage, which runs first.
stage: build
variables:
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
- DEBIAN_FRONTEND: "noninteractive"
- DEBIAN_PRIORITY: "low"
- DEBCONF_NOWARNINGS: "yes"
- DEBCONF_NONINTERACTIVE_SEEN: "true"
- ERRORMODE: 1
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
fallback_keys:
@@ -27,6 +27,10 @@ default:
- apt-cache
unprotect: true
before_script:
+ - - echo -e "\e[0Ksection_start:`date +%s`:debconf_pre[collapsed=true]\r\e[0KSetup debconf's environment"
+ - *debconf
+ - echo -e "\e[0Ksection_end:`date +%s`:debconf_pre\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
- dpkg --add-architecture i386
- dpkg --add-architecture amd64
@@ -52,8 +56,8 @@ default:
- apt-get install apt-utils
- echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages (dry-run)"
- - apt-get upgrade --simulate
+ - - echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
+ - apt-get upgrade
- echo -e "\e[0Ksection_end:`date +%s`:apt_upgraden\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
@@ -97,6 +101,10 @@ build-testing:
variables:
CC: gcc
script:
+ - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+ - *debconf
+ - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -106,7 +114,7 @@ build-testing:
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 NONX86=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-w64-mingw32:
@@ -118,12 +126,16 @@ build-i686-w64-mingw32:
variables:
PREFIX: i686-w64-mingw32
script:
+ - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+ - *debconf
+ - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-i686-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 MINGW=1 || make --directory=src --keep-going CCACHE=1 MINGW=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-linux-gnu:
@@ -138,6 +150,10 @@ build-x86_64-linux-gnu:
OBJDUMP: x86_64-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
script:
+ - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+ - *debconf
+ - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -147,7 +163,7 @@ build-x86_64-linux-gnu:
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 LINUX64=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-linux-gnu:
@@ -162,6 +178,10 @@ build-i686-linux-gnu:
OBJDUMP: i686-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
script:
+ - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+ - *debconf
+ - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -171,7 +191,7 @@ build-i686-linux-gnu:
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 LINUX=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-aarch64-linux-gnu:
@@ -186,6 +206,10 @@ build-aarch64-linux-gnu:
OBJDUMP: aarch64-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
script:
+ - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+ - *debconf
+ - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -195,7 +219,7 @@ build-aarch64-linux-gnu:
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 LINUX64=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 LINUX64=1 NONX86=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-w64-mingw32:
@@ -207,10 +231,14 @@ build-x86_64-w64-mingw32:
variables:
PREFIX: x86_64-w64-mingw32
script:
+ - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+ - *debconf
+ - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-x86-64-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 MINGW64=1 || make --directory=src --keep-going CCACHE=1 MINGW64=1
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
From b8861b19127dabd54b0aed9032bf32975c85a50d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 17:11:44 +0000
Subject: [PATCH 098/115] Update .gitlab-ci.yml file
Let see if I need to need to run export again in the main build script
---
.gitlab-ci.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2582d0cd3..abd769f03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,10 +101,6 @@ build-testing:
variables:
CC: gcc
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
- - *debconf
- - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
-
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
From 3adc15d5214b86fb87c959b85ce551db8c37d9ab Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 17:30:07 +0000
Subject: [PATCH 099/115] Update .gitlab-ci.yml file
Only need to setup debconf in before_script
---
.gitlab-ci.yml | 50 ++++++++++++++++----------------------------------
1 file changed, 16 insertions(+), 34 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abd769f03..27d95d6fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,17 @@
-stages: # List of stages for jobs, and their order of execution
- - build
-
default:
image: debian:stable-slim
-.debconf: &debconf
- export DEBIAN_FRONTEND="noninteractive";
- export DEBIAN_PRIORITY="low";
- export DEBCONF_NONINTERACTIVE_SEEN="true";
-
+stages: # List of stages for jobs, and their order of execution
+ - build
+
+variables:
+ GIT_STRATEGY: clone
+ GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
+
.job_template: &job_build # This job runs in the build stage, which runs first.
+
stage: build
- variables:
- GIT_STRATEGY: clone
- GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
+
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
fallback_keys:
@@ -22,14 +20,18 @@ default:
paths:
- ccache
- ccache_statslog
+
- key: apt-$CI_JOB_IMAGE
paths:
- apt-cache
unprotect: true
+
before_script:
- - - echo -e "\e[0Ksection_start:`date +%s`:debconf_pre[collapsed=true]\r\e[0KSetup debconf's environment"
- - *debconf
- - echo -e "\e[0Ksection_end:`date +%s`:debconf_pre\r\e[0K"
+ - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+ - export DEBIAN_FRONTEND="noninteractive"
+ - export DEBIAN_PRIORITY="low"
+ - export DEBCONF_NONINTERACTIVE_SEEN="true"
+ - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
- dpkg --add-architecture i386
@@ -122,10 +124,6 @@ build-i686-w64-mingw32:
variables:
PREFIX: i686-w64-mingw32
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
- - *debconf
- - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
-
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-i686-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -146,10 +144,6 @@ build-x86_64-linux-gnu:
OBJDUMP: x86_64-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
- - *debconf
- - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
-
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -174,10 +168,6 @@ build-i686-linux-gnu:
OBJDUMP: i686-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
- - *debconf
- - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
-
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -202,10 +192,6 @@ build-aarch64-linux-gnu:
OBJDUMP: aarch64-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
- - *debconf
- - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
-
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -227,10 +213,6 @@ build-x86_64-w64-mingw32:
variables:
PREFIX: x86_64-w64-mingw32
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
- - *debconf
- - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
-
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-x86-64-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
From aa21dcad33857980e6203fe67da2954c26beff5a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 17:50:45 +0000
Subject: [PATCH 100/115] Update .gitlab-ci.yml file
Try to hide echos
---
.gitlab-ci.yml | 197 ++++++++++++++++++++++++++++++++-----------------
1 file changed, 131 insertions(+), 66 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27d95d6fe..c1d983e53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,70 +27,103 @@ variables:
unprotect: true
before_script:
- - - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
- export DEBIAN_FRONTEND="noninteractive"
- export DEBIAN_PRIORITY="low"
- export DEBCONF_NONINTERACTIVE_SEEN="true"
- - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
- dpkg --add-architecture i386
- dpkg --add-architecture amd64
- dpkg --add-architecture arm64
- - echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
- export APT_CACHE_DIR=`pwd`/apt-cache
- - touch /etc/apt/apt.conf.d/99build
- - echo Adding options to apt.conf':'
- - echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build
- - echo quiet "1"\; | tee --append /etc/apt/apt.conf.d/99build
- - echo APT::Get::Assume-Yes "true"\; | tee --append /etc/apt/apt.conf.d/99build
- - echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- - echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
+ - touch /etc/apt/apt.conf.d/99build
+ - |
+ echo Adding options to apt.conf':'
+ - |
+ echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build
+ - |
+ echo quiet "1"\; | tee --append /etc/apt/apt.conf.d/99build
+ - |
+ echo APT::Get::Assume-Yes "true"\; | tee --append /etc/apt/apt.conf.d/99build
+ - |
+ echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
- apt-get update
- - echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
- apt-get install apt-utils
- - echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
- apt-get upgrade
- - echo -e "\e[0Ksection_end:`date +%s`:apt_upgraden\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_upgraden\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
- apt-get install make git ccache
- - echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
- - echo Adding ccache configution option
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
- mkdir --parents --verbose ~/.ccache/
- touch ~/.ccache/ccache.conf
- - echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf
- - echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf
- - echo compiler_check = content | tee --append ~/.ccache/ccache.conf
- - echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
- - echo max_size = 50M | tee --append ~/.ccache/ccache.conf
- - echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
+ - |
+ echo Adding ccache configution option
+ - |
+ echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf
+ - |
+ echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf
+ - |
+ echo compiler_check = content | tee --append ~/.ccache/ccache.conf
+ - |
+ echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
+ - |
+ echo max_size = 50M | tee --append ~/.ccache/ccache.conf
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
- ccache --zero-stats
- ccache --show-stats
- - echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
after_script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
- apt-get autoclean
- - echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
- ccache --show-stats --verbose
- ccache --show-log-stats --verbose
- - echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
build-testing:
<<: *job_build
@@ -103,17 +136,23 @@ build-testing:
variables:
CC: gcc
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-w64-mingw32:
<<: *job_build
@@ -124,13 +163,17 @@ build-i686-w64-mingw32:
variables:
PREFIX: i686-w64-mingw32
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-i686-win32
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-linux-gnu:
<<: *job_build
@@ -144,17 +187,23 @@ build-x86_64-linux-gnu:
OBJDUMP: x86_64-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-i686-linux-gnu:
<<: *job_build
@@ -168,17 +217,23 @@ build-i686-linux-gnu:
OBJDUMP: i686-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-aarch64-linux-gnu:
<<: *job_build
@@ -192,17 +247,23 @@ build-aarch64-linux-gnu:
OBJDUMP: aarch64-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- - echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
build-x86_64-w64-mingw32:
<<: *job_build
@@ -213,10 +274,14 @@ build-x86_64-w64-mingw32:
variables:
PREFIX: x86_64-w64-mingw32
script:
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-x86-64-win32
- - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1
- - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
From 35f57882e47c1206076567ac9e078d46b91a355a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 14:16:13 -0400
Subject: [PATCH 101/115] signalhandlers are function of NORETURN
---
src/sdl/i_system.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index be46cd804..98e036130 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2265,7 +2265,7 @@ void I_Sleep(UINT32 ms)
}
#ifdef NEWSIGNALHANDLER
-static void newsignalhandler_Warn(const char *pr)
+ATTRNORETURN static FUNCNORETURN void newsignalhandler_Warn(const char *pr)
{
char text[128];
From aaebcc6ce1b442589a352e0568a40407cd86c4f3 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 14:24:20 -0400
Subject: [PATCH 102/115] Update src/hardware/hw_batching.c
fix misleading indentation
---
src/hardware/hw_batching.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c
index d1b84a5ee..dc0b5ee5b 100644
--- a/src/hardware/hw_batching.c
+++ b/src/hardware/hw_batching.c
@@ -42,10 +42,10 @@ int unsortedVertexArrayAllocSize = 65536;
// Call HWR_RenderBatches to render all the collected geometry.
void HWR_StartBatching(void)
{
- if (currently_batching)
- I_Error("Repeat call to HWR_StartBatching without HWR_RenderBatches");
+ if (currently_batching)
+ I_Error("Repeat call to HWR_StartBatching without HWR_RenderBatches");
- // init arrays if that has not been done yet
+ // init arrays if that has not been done yet
if (!finalVertexArray)
{
finalVertexArray = malloc(finalVertexArrayAllocSize * sizeof(FOutVector));
@@ -55,7 +55,7 @@ void HWR_StartBatching(void)
unsortedVertexArray = malloc(unsortedVertexArrayAllocSize * sizeof(FOutVector));
}
- currently_batching = true;
+ currently_batching = true;
}
// This replaces the direct calls to pfnSetTexture in cases where batching is available.
From bc852fa099ffcaa345b1230cc094e8989a098721 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 14:34:53 -0400
Subject: [PATCH 103/115] remove unused variables that was only set
---
src/hardware/hw_main.c | 3 ---
src/hardware/hw_model.c | 3 ---
2 files changed, 6 deletions(-)
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index f2022bcea..8260271bd 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -4141,14 +4141,11 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
float xscale, yscale;
float xoffset, yoffset;
float leftoffset, topoffset;
- float scale = spr->scale;
float zoffset = (P_MobjFlip(spr->mobj) * 0.05f);
pslope_t *splatslope = NULL;
INT32 i;
renderflags_t renderflags = spr->renderflags;
- if (renderflags & RF_SHADOWEFFECTS)
- scale *= spr->shadowscale;
if (spr->rotateflags & SRF_3D || renderflags & RF_NOSPLATBILLBOARD)
angle = spr->mobj->angle;
diff --git a/src/hardware/hw_model.c b/src/hardware/hw_model.c
index b69bce0e2..9319939c0 100644
--- a/src/hardware/hw_model.c
+++ b/src/hardware/hw_model.c
@@ -663,7 +663,6 @@ void GeneratePolygonNormals(model_t *model, int ztag)
{
int k;
mdlframe_t *frame = &mesh->frames[j];
- const float *vertices = frame->vertices;
vector_t *polyNormals;
frame->polyNormals = (vector_t*)Z_Malloc(sizeof(vector_t) * mesh->numTriangles, ztag, 0);
@@ -672,8 +671,6 @@ void GeneratePolygonNormals(model_t *model, int ztag)
for (k = 0; k < mesh->numTriangles; k++)
{
-// Vector::Normal(vertices, polyNormals);
- vertices += 3 * 3;
polyNormals++;
}
}
From 6c19fcc607534c2fd9bc79453cc08cd31b7c4782 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 18:56:06 +0000
Subject: [PATCH 104/115] Update .gitlab-ci.yml file
Try compiling with clang
---
.gitlab-ci.yml | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1d983e53..ed75730fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -128,13 +128,17 @@ variables:
build-testing:
<<: *job_build
image: debian:testing-slim
+
allow_failure: true
+
artifacts:
paths:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
+
variables:
CC: gcc
+
script:
- - |
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
@@ -156,12 +160,15 @@ build-testing:
build-i686-w64-mingw32:
<<: *job_build
+
artifacts:
paths:
- "bin/srb2win.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
+
variables:
PREFIX: i686-w64-mingw32
+
script:
- - |
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
@@ -177,15 +184,18 @@ build-i686-w64-mingw32:
build-x86_64-linux-gnu:
<<: *job_build
+
artifacts:
paths:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
+
variables:
CC: x86_64-linux-gnu-gcc
OBJCOPY: x86_64-linux-gnu-objcopy
OBJDUMP: x86_64-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
+
script:
- - |
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
@@ -207,15 +217,18 @@ build-x86_64-linux-gnu:
build-i686-linux-gnu:
<<: *job_build
+
artifacts:
paths:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
+
variables:
CC: i686-linux-gnu-gcc
OBJCOPY: i686-linux-gnu-objcopy
OBJDUMP: i686-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
+
script:
- - |
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
@@ -237,15 +250,18 @@ build-i686-linux-gnu:
build-aarch64-linux-gnu:
<<: *job_build
+
artifacts:
paths:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
+
variables:
CC: aarch64-linux-gnu-gcc
OBJCOPY: aarch64-linux-gnu-objcopy
OBJDUMP: aarch64-linux-gnu-objdump
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
+
script:
- - |
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
@@ -267,12 +283,15 @@ build-aarch64-linux-gnu:
build-x86_64-w64-mingw32:
<<: *job_build
+
artifacts:
paths:
- "bin/srb2win64.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
+
variables:
PREFIX: x86_64-w64-mingw32
+
script:
- - |
echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
@@ -285,3 +304,37 @@ build-x86_64-w64-mingw32:
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1
- |
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+build-clang:
+ <<: *job_build
+
+ allow_failure: true
+
+ artifacts:
+ paths:
+ - "bin/lsdl2srb2*"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
+
+ variables:
+ CC: clang
+ CFLAGS: -Wno-cast-align
+
+ script:
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ - apt-get install clang
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ - apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
From b6aaf582d12c745c542a71c3c75df741fded1bf2 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 15:29:20 -0400
Subject: [PATCH 105/115] Update src/hardware/mw_md2.c
fscanf need 26 chars in the name buffer
---
src/hardware/hw_md2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 6123eb9a9..914683db7 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -486,7 +486,7 @@ void HWR_InitModels(void)
size_t i;
INT32 s;
FILE *f;
- char name[24], filename[32];
+ char name[26], filename[32];
float scale, offset;
size_t prefixlen;
From 1372b60db9912288121a980709e38c186189b9f0 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 16:00:25 -0400
Subject: [PATCH 106/115] Update src/hardware/mw_md2.c
there are 2 more name buffers that need to be bigger
---
src/hardware/hw_md2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 914683db7..0f8342135 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -585,7 +585,7 @@ modelfound:
void HWR_AddPlayerModel(int skin) // For skins that were added after startup
{
FILE *f;
- char name[24], filename[32];
+ char name[26], filename[32];
float scale, offset;
size_t prefixlen;
@@ -644,7 +644,7 @@ void HWR_AddSpriteModel(size_t spritenum) // For sprites that were added after s
// name[24] is used to check for names in the models.dat file that match with sprites or player skins
// sprite names are always 4 characters long, and names is for player skins can be up to 19 characters long
// PLAYERMODELPREFIX is 6 characters long
- char name[24], filename[32];
+ char name[26], filename[32];
float scale, offset;
if (nomd2s)
From 976a2850af54c0abcff0fab991e5a3b66bea8636 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 16:02:27 -0400
Subject: [PATCH 107/115] Update .gitlab-ci.yml file
change name of artifact for clang build
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed75730fd..7db8198d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -313,7 +313,7 @@ build-clang:
artifacts:
paths:
- "bin/lsdl2srb2*"
- name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang"
variables:
CC: clang
From b27de309a87051160903035a565f65c9cfd13a60 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 20:32:11 +0000
Subject: [PATCH 108/115] Update .gitlab-ci.yml file
Testing compiling with Debian's testing clang package
---
.gitlab-ci.yml | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7db8198d3..890b4b94a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,7 +134,7 @@ build-testing:
artifacts:
paths:
- "bin/lsdl2srb2*"
- name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-gcc"
variables:
CC: gcc
@@ -338,3 +338,39 @@ build-clang:
- |
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
+build-clang-testing:
+ <<: *job_build
+
+ image: debian:testing-slim
+
+ allow_failure: true
+
+ artifacts:
+ paths:
+ - "bin/lsdl2srb2*"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-clang"
+
+ variables:
+ CC: clang
+ CFLAGS: -Wno-cast-align
+
+ script:
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ - apt-get install clang
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ - apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
+ - - |
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
+ - |
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+
From 4bec14342760a5f6b547d0e80a4581a5e8e992a1 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 23:42:27 +0000
Subject: [PATCH 109/115] Update .gitlab-ci.yml file
Do not care for non-prototypes for clang-testing job
---
.gitlab-ci.yml | 26 +++-----------------------
1 file changed, 3 insertions(+), 23 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 890b4b94a..527dc1804 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -342,9 +342,9 @@ build-clang:
build-clang-testing:
<<: *job_build
- image: debian:testing-slim
+ extends: build-clang
- allow_failure: true
+ image: debian:testing-slim
artifacts:
paths:
@@ -353,24 +353,4 @@ build-clang-testing:
variables:
CC: clang
- CFLAGS: -Wno-cast-align
-
- script:
- - - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - apt-get install clang
- - |
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
-
- - - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- - apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- - |
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
-
- - - |
- echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- - |
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-
+ CFLAGS: -Wno-cast-align -Wno-deprecated-non-prototype
From 6a37b3c0c66ee30ecdcc67b8bad793d97c12c70d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 20:30:06 -0400
Subject: [PATCH 110/115] Update src/hardware/mw_model.c
Restore old code in GeneratePolygonNormals(), add TODO
---
src/hardware/hw_model.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/hardware/hw_model.c b/src/hardware/hw_model.c
index 9319939c0..4b6bce6f7 100644
--- a/src/hardware/hw_model.c
+++ b/src/hardware/hw_model.c
@@ -663,6 +663,7 @@ void GeneratePolygonNormals(model_t *model, int ztag)
{
int k;
mdlframe_t *frame = &mesh->frames[j];
+ const float *vertices = frame->vertices;
vector_t *polyNormals;
frame->polyNormals = (vector_t*)Z_Malloc(sizeof(vector_t) * mesh->numTriangles, ztag, 0);
@@ -671,6 +672,11 @@ void GeneratePolygonNormals(model_t *model, int ztag)
for (k = 0; k < mesh->numTriangles; k++)
{
+ /// TODO: normalize vectors
+ (void)vertices;
+ (void)polyNormals;
+// Vector::Normal(vertices, polyNormals);
+ vertices += 3 * 3;
polyNormals++;
}
}
From de4a8a193bc56eb6b1e3cf936cdec89407cdb0c9 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 20:31:57 -0400
Subject: [PATCH 111/115] Update src/d_clisrv.c
Remove unused i var in Ban_Load_File()
---
src/d_clisrv.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 83482b527..1ec9cf1e9 100755
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2743,7 +2743,6 @@ static void Command_ClearBans(void)
static void Ban_Load_File(boolean warning)
{
FILE *f;
- size_t i;
const char *address, *mask;
char buffer[MAX_WADPATH];
@@ -2761,7 +2760,7 @@ static void Ban_Load_File(boolean warning)
Ban_Clear();
- for (i=0; fgets(buffer, (int)sizeof(buffer), f); i++)
+ for (; fgets(buffer, (int)sizeof(buffer), f);)
{
address = strtok(buffer, " \t\r\n");
mask = strtok(NULL, " \t\r\n");
From 2865873e7040222632a6d3aa1573c4ea44d704d5 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 20:35:04 -0400
Subject: [PATCH 112/115] Update src/lua_baselib.c
No need of counting bots.
---
src/lua_baselib.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 4af5066ae..1d183cdec 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -3544,7 +3544,7 @@ static int lib_gAddGametype(lua_State *L)
// Partly lifted from Got_AddPlayer
static int lib_gAddPlayer(lua_State *L)
{
- INT16 i, newplayernum, botcount = 1;
+ INT16 i, newplayernum;
player_t *newplayer;
SINT8 skinnum = 0, bot;
@@ -3552,10 +3552,8 @@ static int lib_gAddPlayer(lua_State *L)
{
if (!playeringame[i])
break;
-
- if (players[i].bot)
- botcount++; // How many of us are there already?
}
+
if (i >= MAXPLAYERS)
{
lua_pushnil(L);
From 33f6deb7f02e4f7f88a6e4903af24fe42473e89a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 15 Oct 2023 23:57:00 -0400
Subject: [PATCH 113/115] Update sc/netcode/commands.c
'i' variable is set but unused in Ban_Load_File()
---
src/netcode/commands.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/netcode/commands.c b/src/netcode/commands.c
index 4228027d2..4b67198ba 100644
--- a/src/netcode/commands.c
+++ b/src/netcode/commands.c
@@ -96,7 +96,7 @@ void Ban_Load_File(boolean warning)
Ban_Clear();
- for (size_t i=0; fgets(buffer, (int)sizeof(buffer), f); i++)
+ for (; fgets(buffer, (int)sizeof(buffer), f);)
{
address = strtok(buffer, " \t\r\n");
mask = strtok(NULL, " \t\r\n");
From 330b10cbb593bf859726334b7435b7a8d114cfdf Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 17 Oct 2023 01:41:43 +0000
Subject: [PATCH 114/115] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 263 ++++++++++++++++++++++++++++++++-----------------
1 file changed, 170 insertions(+), 93 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 527dc1804..a849aea28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,104 +28,134 @@ variables:
before_script:
- - |
- echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
+ # debconf
+ echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
- export DEBIAN_FRONTEND="noninteractive"
- export DEBIAN_PRIORITY="low"
- export DEBCONF_NONINTERACTIVE_SEEN="true"
- |
- echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
-
+ # debconf
+ echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
+ # dpkg_aa
+ echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
- dpkg --add-architecture i386
- dpkg --add-architecture amd64
- dpkg --add-architecture arm64
- |
- echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
-
+ # dpkg_aa
+ echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
+ # apt_conf
+ echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
- export APT_CACHE_DIR=`pwd`/apt-cache
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
- touch /etc/apt/apt.conf.d/99build
- |
- echo Adding options to apt.conf':'
+ # apt.conf
+ echo Adding options to apt.conf':'
- |
- echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build
+ # APT::Install-Recommends
+ echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build
- |
- echo quiet "1"\; | tee --append /etc/apt/apt.conf.d/99build
+ # quit
+ echo quiet "1"\; | tee --append /etc/apt/apt.conf.d/99build
- |
- echo APT::Get::Assume-Yes "true"\; | tee --append /etc/apt/apt.conf.d/99build
+ # APT::Get::Assume-Yes
+ echo APT::Get::Assume-Yes "true"\; | tee --append /etc/apt/apt.conf.d/99build
- |
- echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
+ # Dir::Cache::Archives
+ echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
-
+ # apt_conf
+ echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
+ # apt_update
+ echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
- apt-get update
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
+ # apt_update
+ echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
+ # apt_pre
+ echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
- apt-get install apt-utils
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
+ # apt_pre
+ echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
+ # apt_upgrade
+ echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
- apt-get upgrade
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_upgraden\r\e[0K"
+ # apt_update
+ echo -e "\e[0Ksection_end:`date +%s`:apt_upgrade\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
+ # apt_common
+ echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
- apt-get install make git ccache
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
+ # apt_common
+ echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
+ # ccache_config
+ echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
- mkdir --parents --verbose ~/.ccache/
- touch ~/.ccache/ccache.conf
- |
- echo Adding ccache configution option
+ # cache.conf
+ echo Adding ccache configution option
- |
- echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf
+ # base_dir
+ echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf
- |
- echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf
+ # cache_dir
+ echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf
- |
- echo compiler_check = content | tee --append ~/.ccache/ccache.conf
+ # compiler_check
+ echo compiler_check = content | tee --append ~/.ccache/ccache.conf
- |
- echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
+ # stats_log
+ echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
- |
- echo max_size = 50M | tee --append ~/.ccache/ccache.conf
+ # max_size
+ echo max_size = 50M | tee --append ~/.ccache/ccache.conf
- |
- echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
+ # ccache_config
+ echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
+ # cache_reset
+ echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
- ccache --zero-stats
- ccache --show-stats
- |
- echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
+ # ccache_reset
+ echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
after_script:
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
+ # apt_clean
+ echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
- apt-get autoclean
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
+ # apt_clean
+ echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
+ # ccache_stats
+ echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
- ccache --show-stats --verbose
- ccache --show-log-stats --verbose
- |
- echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
+ # ccahe_stats
+ echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
-build-testing:
+Debian testing GCC:
<<: *job_build
image: debian:testing-slim
@@ -133,7 +163,8 @@ build-testing:
artifacts:
paths:
- - "bin/lsdl2srb2*"
+ - "bin/"
+ - "src/comptime.h"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-gcc"
variables:
@@ -141,29 +172,36 @@ build-testing:
script:
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ # apt_toolchain
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ # apt_toolchain
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ # apt_development
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ # apt_development
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ # make
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- |
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ # make
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-build-i686-w64-mingw32:
+Windows x86:
<<: *job_build
artifacts:
paths:
- - "bin/srb2win.exe*"
+ - "bin/"
+ - "src/comptime.h"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
variables:
@@ -171,23 +209,28 @@ build-i686-w64-mingw32:
script:
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ # apt_toolchain
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-i686-win32
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ # apt_toolchain
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ # make
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1
- |
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ # make
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-build-x86_64-linux-gnu:
+Debian stable:amd64:
<<: *job_build
artifacts:
paths:
- - "bin/lsdl2srb2*"
+ - "bin/"
+ - "src/comptime.h"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
variables:
@@ -198,29 +241,36 @@ build-x86_64-linux-gnu:
script:
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ # apt_toolchain
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ # apt_toolchain
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ # apt_development
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ # apt_development
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ # make
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
- |
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ # make
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-build-i686-linux-gnu:
+Debian stable:i386:
<<: *job_build
artifacts:
paths:
- - "bin/lsdl2srb2*"
+ - "bin/"
+ - "src/comptime.h"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
variables:
@@ -231,29 +281,36 @@ build-i686-linux-gnu:
script:
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ # apt_toolchain
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ # apt_toolchain
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ # apt_development
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ # apt_development
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ # make
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
- |
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ # make
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-build-aarch64-linux-gnu:
+Debian stable:arm64:
<<: *job_build
artifacts:
paths:
- - "bin/lsdl2srb2*"
+ - "bin/"
+ - "src/comptime.h"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
variables:
@@ -264,29 +321,37 @@ build-aarch64-linux-gnu:
script:
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ # apt_toolchain
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ # apt_toolchain
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ # apt_development
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ # apt_development
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ # make
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
- |
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ # make
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-build-x86_64-w64-mingw32:
+Windows x64:
<<: *job_build
artifacts:
paths:
- - "bin/srb2win64.exe*"
+ - "bin/"
+ - "src/comptime.h"
+ expose_as: "Win64"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
variables:
@@ -294,25 +359,31 @@ build-x86_64-w64-mingw32:
script:
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ # apt_toolchain
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install gcc-mingw-w64-x86-64-win32
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ # apt_toolchain
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ # make
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1
- |
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ # make
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-build-clang:
+Debian stable Clang:
<<: *job_build
allow_failure: true
artifacts:
paths:
- - "bin/lsdl2srb2*"
+ - "bin/"
+ - "src/comptime.h"
+ expose_as: "Debian with clang"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang"
variables:
@@ -321,34 +392,40 @@ build-clang:
script:
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
+ # apt_toolchain
+ echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- apt-get install clang
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
+ # apt_toolchain
+ echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
+ # apt_development
+ echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- |
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+ # apt_development
+ echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - |
- echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
+ # make
+ echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- |
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
+ # make
+ echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-build-clang-testing:
- <<: *job_build
-
- extends: build-clang
+Debian testing Clang:
+ extends: Debian stable Clang
image: debian:testing-slim
artifacts:
paths:
- - "bin/lsdl2srb2*"
+ - "bin/"
+ - "src/comptime.h"
+ expose_as: "Debian testing with clang"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-clang"
variables:
From 265c1ac0c8dd57a689962d72b7c103710f7bb1a7 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 17 Oct 2023 13:11:17 +0000
Subject: [PATCH 115/115] Update .gitlib-ci.yml
---
.gitlab-ci.yml | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a849aea28..f13dac2f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ variables:
- export DEBIAN_PRIORITY="low"
- export DEBCONF_NONINTERACTIVE_SEEN="true"
- |
- # debconf
+ # debconf
echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
- - |
# dpkg_aa
@@ -67,7 +67,7 @@ variables:
# Dir::Cache::Archives
echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
- |
- # apt_conf
+ # apt_conf
echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
- - |
# apt_update
@@ -110,7 +110,7 @@ variables:
# cache.conf
echo Adding ccache configution option
- |
- # base_dir
+ # base_dir
echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf
- |
# cache_dir
@@ -165,6 +165,7 @@ Debian testing GCC:
paths:
- "bin/"
- "src/comptime.h"
+ expose_as: "Debian GCC testing"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-gcc"
variables:
@@ -231,6 +232,7 @@ Debian stable:amd64:
paths:
- "bin/"
- "src/comptime.h"
+ expose_as: "Debian amd64"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
variables:
@@ -271,6 +273,7 @@ Debian stable:i386:
paths:
- "bin/"
- "src/comptime.h"
+ expose_as: "Debian i386"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
variables:
@@ -311,6 +314,7 @@ Debian stable:arm64:
paths:
- "bin/"
- "src/comptime.h"
+ expose_as: "Debian arm64"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
variables:
@@ -383,7 +387,7 @@ Debian stable Clang:
paths:
- "bin/"
- "src/comptime.h"
- expose_as: "Debian with clang"
+ expose_as: "Debian Clang"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang"
variables:
@@ -412,10 +416,9 @@ Debian stable Clang:
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- |
- # make
+ # make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-
Debian testing Clang:
extends: Debian stable Clang
@@ -425,7 +428,7 @@ Debian testing Clang:
paths:
- "bin/"
- "src/comptime.h"
- expose_as: "Debian testing with clang"
+ expose_as: "Debina Clang testing"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-clang"
variables: