diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/convert_font.c | 6 | ||||
| -rwxr-xr-x | tools/jenkins-build.sh | 24 |
2 files changed, 26 insertions, 4 deletions
diff --git a/tools/convert_font.c b/tools/convert_font.c index 9f5734b71..d22c85920 100644 --- a/tools/convert_font.c +++ b/tools/convert_font.c @@ -290,14 +290,14 @@ static bool generate_font_header(const char *path, struct font_data *data) for (s = 0; s < 4; s++) { - fprintf(fp, "const uint8_t *%s_section_table;\n", + fprintf(fp, "extern const uint8_t *%s_section_table;\n", var_lables[s]); - fprintf(fp, "const uint16_t *%s_sections;\n", + fprintf(fp, "extern const uint16_t *%s_sections;\n", var_lables[s]); } - fprintf(fp, "const uint8_t *font_glyph_data;\n"); + fprintf(fp, "extern const uint8_t *font_glyph_data;\n"); fprintf(fp, "\n\n"); diff --git a/tools/jenkins-build.sh b/tools/jenkins-build.sh index d31b233b4..7dcd788a0 100755 --- a/tools/jenkins-build.sh +++ b/tools/jenkins-build.sh @@ -54,11 +54,16 @@ MAKE=make # NetSurf version number haiku needs it for package name NETSURF_VERSION="3.11" +UPDATE_LATEST=yes + # Ensure the combination of target and toolchain works and set build # specific parameters too case ${TARGET} in "riscos") case ${HOST} in + "arm-riscos-gnueabi") + UPDATE_LATEST=no + ;; "arm-unknown-riscos") ;; @@ -69,6 +74,10 @@ case ${TARGET} in esac + export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env + export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin + IDENTIFIER="${HOST}-${IDENTIFIER}" + OLD_IDENTIFIER="${HOST}-${OLD_IDENTIFIER}" PKG_SRC=netsurf PKG_SFX=.zip ;; @@ -285,6 +294,11 @@ case ${TARGET} in MAKE=gmake ;; + "arm-riscos-gnueabi") + export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env + export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin + ;; + "arm-unknown-riscos") export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin @@ -341,6 +355,11 @@ case ${TARGET} in MAKE=gmake ;; + "arm-riscos-gnueabi") + export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env + export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin + ;; + "arm-unknown-riscos") export GCCSDK_INSTALL_ENV=/opt/netsurf/${HOST}/env export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${HOST}/cross/bin @@ -483,4 +502,7 @@ done ############ Expired package artifact removal and latest linking ############## -ssh netsurf@ci.netsurf-browser.org "rm -f ${OLD_ARTIFACT_TARGETS} ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST" +ssh netsurf@ci.netsurf-browser.org "rm -f ${OLD_ARTIFACT_TARGETS}" +if [ ${UPDATE_LATEST} = "yes" ]; then + ssh netsurf@ci.netsurf-browser.org "rm -f ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST" +fi |