Skip to content

Commit

Permalink
Refactor scripts/
Browse files Browse the repository at this point in the history
  • Loading branch information
juzzlin committed Jan 6, 2020
1 parent 05acdc0 commit 88b9b87
Show file tree
Hide file tree
Showing 17 changed files with 5 additions and 44 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Expand Up @@ -105,7 +105,7 @@ Bug fixes:

Other:

* Properly check for empty version in mxeWindowsBuild.sh
* Properly check for empty version in mxe-windows-build

2.0.0
=====
Expand Down
4 changes: 2 additions & 2 deletions INSTALL
Expand Up @@ -48,7 +48,7 @@ GCC/MinGW and Clang are the only "officially" supported toolchains on Linux.
Windows builds are done in a Docker container with MXE (http://mxe.cc). The build script
also generates automatically an NSIS Windows installer and a ZIP-archive.

See scripts/buildWindowsInstaller.sh and scripts/mxeWindowsBuild.sh.
See scripts/build-windows-installer and scripts/mxe-windows-build.

Building the project with Microsoft Visual C++ 2013 also works, but no automatic
packaging/deployment currently exist. The runtime files (data/, Qt, OpenAL..) must be
Expand Down Expand Up @@ -126,7 +126,7 @@ Cross-compiling for Windows in Docker with MXE on Linux

1) Install Docker

2) `$ ./scripts/buildWindowsInstaller.sh`
2) `$ ./scripts/build-windows-installer`

CPack
=====
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Expand Up @@ -70,7 +70,7 @@ pipeline {
}
}
steps {
sh "./scripts/buildWindowsInstaller.sh"
sh "./scripts/build-windows-installer"
}
post {
always {
Expand Down
4 changes: 0 additions & 4 deletions scripts/archive.sh

This file was deleted.

Expand Up @@ -7,7 +7,7 @@ DUSTRAC_RELEASE_VERSION=2.0.4
CMD="export LANG=en_US.UTF-8 && \
export LC_ALL=en_US.UTF-8 && \
export PATH='$PATH':/mxe/usr/bin && \
cd /dr2d && DUSTRAC_RELEASE_VERSION=${DUSTRAC_RELEASE_VERSION} ./scripts/mxeWindowsBuild.sh"
cd /dr2d && DUSTRAC_RELEASE_VERSION=${DUSTRAC_RELEASE_VERSION} ./scripts/mxe-windows-build"

if [ -f /.dockerenv ]; then
echo "Script inside Docker"
Expand Down
6 changes: 0 additions & 6 deletions scripts/ci/jenkins-cmake-debug.sh

This file was deleted.

6 changes: 0 additions & 6 deletions scripts/ci/jenkins-cmake.sh

This file was deleted.

11 changes: 0 additions & 11 deletions scripts/ci/jenkins-mxe.sh

This file was deleted.

6 changes: 0 additions & 6 deletions scripts/ci/jenkins-qmake.sh

This file was deleted.

6 changes: 0 additions & 6 deletions scripts/ci/jenkins-tests.sh

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 88b9b87

Please sign in to comment.