Skip to content
Snippets Groups Projects
Commit 4e68f4c1 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Comment-out "classic" Linux builds, "disable Javascript" for sbbs.h in gtk utils

parent 325cede6
No related branches found
No related tags found
1 merge request!455Update branch with changes from master
...@@ -50,21 +50,21 @@ include: ...@@ -50,21 +50,21 @@ include:
tagname: "Linux" tagname: "Linux"
has_gtk: "yes" has_gtk: "yes"
sbbs-linux: #sbbs-linux:
tags: [Linux] # tags: [Linux]
image: gcc # image: gcc
stage: build # stage: build
extends: .rules # extends: .rules
script: # script:
- cd src/sbbs3 # - cd src/sbbs3
- make RELEASE=1 all # - make RELEASE=1 all
- make RELEASE=1 gtkutils # - make RELEASE=1 gtkutils
artifacts: # artifacts:
name: sbbs-linux-x64 # name: sbbs-linux-x64
paths: # paths:
- "src/sbbs3/*.exe.release/*" # - "src/sbbs3/*.exe.release/*"
- "src/sbbs3/*.lib.release/*" # - "src/sbbs3/*.lib.release/*"
- "src/sbbs3/*/*.exe.release/*" # - "src/sbbs3/*/*.exe.release/*"
smoketest-jsexec-linux: smoketest-jsexec-linux:
tags: [Linux] tags: [Linux]
...@@ -77,32 +77,32 @@ smoketest-jsexec-linux: ...@@ -77,32 +77,32 @@ smoketest-jsexec-linux:
- "*.exe.release/jsexec -C -c../../ctrl -r 'exit(0)'" - "*.exe.release/jsexec -C -c../../ctrl -r 'exit(0)'"
dependencies: [sbbs-linux] dependencies: [sbbs-linux]
sexpots-linux: #sexpots-linux:
tags: [Linux] # tags: [Linux]
image: gcc # image: gcc
stage: build # stage: build
extends: .rules # extends: .rules
script: # script:
- cd src/sexpots # - cd src/sexpots
- make RELEASE=1 # - make RELEASE=1
artifacts: # artifacts:
name: sexpots-linux-x64 # name: sexpots-linux-x64
paths: # paths:
- "src/sexpots/*.exe.release/*" # - "src/sexpots/*.exe.release/*"
syncterm-linux: #syncterm-linux:
tags: [Linux] # tags: [Linux]
image: gcc # image: gcc
stage: build # stage: build
extends: .rules # extends: .rules
script: # script:
- cd src/syncterm # - cd src/syncterm
- make RELEASE=1 PREFIX=/usr dpkg # - make RELEASE=1 PREFIX=/usr dpkg
artifacts: # artifacts:
name: syncterm-linux-x64 # name: syncterm-linux-x64
paths: # paths:
- "src/syncterm/*.exe.release/*" # - "src/syncterm/*.exe.release/*"
- "src/syncterm/syncterm*.deb" # - "src/syncterm/syncterm*.deb"
sbbs-windows: sbbs-windows:
tags: [Windows] tags: [Windows]
...@@ -169,31 +169,31 @@ syncterm-msvc: ...@@ -169,31 +169,31 @@ syncterm-msvc:
paths: paths:
- "src/syncterm/Release/*.exe" - "src/syncterm/Release/*.exe"
syncdraw-linux: #syncdraw-linux:
tags: [Linux] # tags: [Linux]
image: gcc # image: gcc
stage: build # stage: build
extends: .rules # extends: .rules
script: # script:
- cd src/syncdraw # - cd src/syncdraw
- make RELEASE=1 # - make RELEASE=1
artifacts: # artifacts:
name: syncdraw-linux-x64 # name: syncdraw-linux-x64
paths: # paths:
- "src/syncdraw/*.exe.release/*" # - "src/syncdraw/*.exe.release/*"
jsdoor-linux: #jsdoor-linux:
tags: [Linux] # tags: [Linux]
image: gcc # image: gcc
stage: build # stage: build
extends: .rules # extends: .rules
script: # script:
- cd src/sbbs3 # - cd src/sbbs3
- make RELEASE=1 jsdoor # - make RELEASE=1 jsdoor
artifacts: # artifacts:
name: jsdoor-linux-x64 # name: jsdoor-linux-x64
paths: # paths:
- "src/sbbs3/*.exe.release/*" # - "src/sbbs3/*.exe.release/*"
sbbs-freebsd-noskeeters: sbbs-freebsd-noskeeters:
extends: extends:
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <utime.h> #include <utime.h>
#include <unistd.h> #include <unistd.h>
#undef JAVASCRIPT
#include "sbbs.h" #include "sbbs.h"
#include "chatfuncs.h" #include "chatfuncs.h"
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#undef JAVASCRIPT
#include "sbbs.h" #include "sbbs.h"
#include "chatfuncs.h" #include "chatfuncs.h"
......
#include <gtk/gtk.h> #include <gtk/gtk.h>
#undef JAVASCRIPT
#include "sbbs.h" #include "sbbs.h"
#include "dirwrap.h" #include "dirwrap.h"
#include "xpbeep.h" #include "xpbeep.h"
......
#include <gtk/gtk.h> #include <gtk/gtk.h>
#undef JAVASCRIPT
#include "sbbs.h" #include "sbbs.h"
#include "dirwrap.h" #include "dirwrap.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment