|
86 | 86 | mkdir -p out
|
87 | 87 | cd "out"
|
88 | 88 | cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/x86_64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=/usr/bin/x86_64-linux-gnu-g++ ..
|
89 |
| - make -j$(nproc) |
| 89 | + make "-j$(nproc)" |
90 | 90 | cp libosintgram4j.so "$CURRENT_WORKDIR/out/project/input"
|
91 | 91 |
|
| 92 | + set +e |
| 93 | + |
92 | 94 | MINGW_C="$(command -v x86_64-w64-mingw32-gcc)"
|
93 | 95 | MINGW_CPP="$(command -v x86_64-w64-mingw32-g++)"
|
94 | 96 |
|
95 | 97 | if [ -n "$MINGW_C" ] && [ -n "$MINGW_CPP" ]; then
|
96 |
| - echo "* Compiling CXX code for Windows" |
| 98 | + echo "* Compiling CXX code for Windows x86_64" |
97 | 99 |
|
98 | 100 | cd "$CURRENT_WORKDIR/cxx"
|
99 | 101 | mkdir win
|
100 | 102 | cd win
|
101 | 103 | cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$MINGW_C" -DCMAKE_CXX_COMPILER="$MINGW_CPP" ..
|
102 |
| - make -j$(nproc) |
| 104 | + make "-j$(nproc)" |
103 | 105 | cp osintgram4j.dll "$CURRENT_WORKDIR/out/project/input"
|
104 | 106 | fi
|
105 | 107 |
|
| 108 | + set -e |
| 109 | + |
106 | 110 | cd "$CURRENT_WORKDIR"
|
107 | 111 | fi
|
108 | 112 |
|
@@ -133,8 +137,6 @@ echo '## Making "modapi.jar"'
|
133 | 137 | echo '## Making "core.jar"'
|
134 | 138 | "$JAR_CMD" -cfm out/project/input/core.jar META-INF/MANIFEST.MF -C out/project/core .
|
135 | 139 |
|
136 |
| -## Minimal Java Runtime Removal: Modding will be limited, if not removed |
137 |
| - |
138 | 140 | echo '## Building the Application Package'
|
139 | 141 | cp out/libs/json.jar out/project/input/json.jar
|
140 | 142 | cp AppSettings.cfg out/project/input/AppSettings.cfg
|
@@ -168,7 +170,7 @@ if [[ "$INSTALL_CHOICE" =~ ^[Yy]$ ]]; then
|
168 | 170 | fi
|
169 | 171 | fi
|
170 | 172 |
|
171 |
| - echo "Copying built files" |
| 173 | + echo "> Copying built files" |
172 | 174 | "$PREFIX" mkdir -p /usr/share/bc100dev/osintgram4j/
|
173 | 175 | "$PREFIX" cp -r out/pkg/osintgram4j/* /usr/share/bc100dev/osintgram4j
|
174 | 176 | "$PREFIX" ln -s /usr/share/bc100dev/osintgram4j/bin/osintgram4j /usr/bin/osintgram4j
|
|
0 commit comments