Commit 32e67f9311fd2e73fe09baebe0b52345ad86c113
1 parent
b01c7a87
Exists in
master
and in
5 other branches
Refactoring windows package builder.
Showing
1 changed file
with
46 additions
and
5 deletions
Show diff stats
win/pack.sh
... | ... | @@ -147,13 +147,14 @@ buildLibrary() |
147 | 147 | --host=${host} \ |
148 | 148 | --prefix=${prefix} \ |
149 | 149 | --bindir=${WORKDIR}/build/${ARCH}/bin \ |
150 | - --libdir=${WORKDIR}/build/${ARCH}/lib \ | |
150 | + --libdir=${WORKDIR}/build/${ARCH}/bin \ | |
151 | 151 | --localedir=${WORKDIR}/build/${ARCH}/locale \ |
152 | 152 | --includedir=${WORKDIR}/build/${ARCH}/include \ |
153 | 153 | --sysconfdir=${WORKDIR}/build/${ARCH}/sysconfig \ |
154 | 154 | --datadir=${WORKDIR}/build/${ARCH}/data \ |
155 | 155 | --datarootdir=${WORKDIR}/build/${ARCH}/data |
156 | 156 | |
157 | + | |
157 | 158 | if [ "$?" != "0" ]; then |
158 | 159 | failed "Can't configure ${1}" |
159 | 160 | fi |
... | ... | @@ -249,10 +250,48 @@ buildApplication() |
249 | 250 | |
250 | 251 | if [ -e ./win/${1}.nsi ]; then |
251 | 252 | cp "./win/${1}.nsi" "${WORKDIR}/build/${ARCH}" |
253 | + if [ "$?" != "0" ]; then | |
254 | + failed "Can't copy ${1}.nsi" | |
255 | + fi | |
256 | + fi | |
257 | + | |
258 | + if [ -e ./win/makeruntime.sh ]; then | |
259 | + cp "./win/makeruntime.sh" "${WORKDIR}/build/${ARCH}/${1}-makeruntime.sh" | |
260 | + if [ "$?" != "0" ]; then | |
261 | + failed "Can't copy ${1}.makeruntime.sh" | |
262 | + fi | |
252 | 263 | fi |
253 | 264 | |
254 | 265 | done |
255 | 266 | |
267 | +} | |
268 | + | |
269 | +# | |
270 | +# Make runtime | |
271 | +# | |
272 | +makeRuntime() { | |
273 | + | |
274 | + for ARCH in ${ARCHS} | |
275 | + do | |
276 | + | |
277 | + echo -e "\e]2;Building runtime for ${ARCH}\a" | |
278 | + echo "Building runtime for ${ARCH}" | |
279 | + | |
280 | + rm -fr ${WORKDIR}/build/${ARCH}/runtime | |
281 | + mkdir -p ${WORKDIR}/build/${ARCH}/runtime | |
282 | + | |
283 | + for SCRIPT in ${WORKDIR}/build/${ARCH}/*-makeruntime.sh | |
284 | + do | |
285 | + chmod +x ${SCRIPT} | |
286 | + | |
287 | + cd ${WORKDIR}/build/${ARCH} | |
288 | + ${SCRIPT} --path="${WORKDIR}/build/${ARCH}/runtime" --bindir="${WORKDIR}/build/${ARCH}/bin" | |
289 | + if [ "$?" != "0" ]; then | |
290 | + failed "Error on ${SCRIPT}" | |
291 | + fi | |
292 | + done | |
293 | + | |
294 | + done | |
256 | 295 | |
257 | 296 | } |
258 | 297 | |
... | ... | @@ -289,8 +328,8 @@ do |
289 | 328 | echo "" |
290 | 329 | |
291 | 330 | if [ ! -z ${WIN_PACKAGE_SERVER} ]; then |
292 | - echo " --nopublish Don't publish binaries in ${WIN_PACKAGE_SERVER}" | |
293 | - echo " --publish Publish binaries in ${WIN_PACKAGE_SERVER}" | |
331 | + echo " --nopublish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PROJECT_NAME}" | |
332 | + echo " --publish Publish binaries in ${WIN_PACKAGE_SERVER}/${PROJECT_NAME}" | |
294 | 333 | fi |
295 | 334 | |
296 | 335 | |
... | ... | @@ -350,8 +389,10 @@ do |
350 | 389 | buildLibrary lib3270-${src}-bindings |
351 | 390 | done |
352 | 391 | |
353 | -cd ${WORKDIR}/build | |
354 | -/bin/bash | |
392 | +# | |
393 | +# Create runtime | |
394 | +# | |
395 | +makeRuntime | |
355 | 396 | |
356 | 397 | cleanup |
357 | 398 | ... | ... |