Overview
Comment: | nsf/build.sh: Added support for builds from development (GIT) tarballs |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 0e51e4f7c374212d4f174036fc4ed84b56ddf98f |
User & Date: | ssoberni on 2016-09-28 15:53:29 |
Other Links: | manifest | tags |
Context
2016-09-28
| ||
16:05 | nsf/build.sh: Cleaning up check-in: cb92ff30f0 user: ssoberni tags: trunk | |
15:53 | nsf/build.sh: Added support for builds from development (GIT) tarballs check-in: 0e51e4f7c3 user: ssoberni tags: trunk | |
14:24 | KitCreator 0.10.0 check-in: 176640acaf user: rkeene tags: trunk, 0.10.0 | |
Changes
Modified nsf/build.sh from [8ab6337fe5] to [6bd5482853].
7 7 fi 8 8 if [ -z "${TCLVERS}" ]; then 9 9 echo 'ERROR: The TCLVERS environment variable is not set' >&2 10 10 11 11 exit 1 12 12 fi 13 13 14 -NSFVERS="2.0.0" 15 -NSFVERSEXTRA="" 16 -SRC="src/nsf${NSFVERS}.tar.gz" 17 -SRCURL="http://sourceforge.net/projects/next-scripting/files/${NSFVERS}/nsf${NSFVERS}.tar.gz/download" 18 -SRCHASH='-' 14 + 15 +use_git='0' 16 + 17 +if echo "${TCLVERS}" | grep '^fossil_' >/dev/null; then 18 + use_git='1' 19 + GITTAG='master' 20 + NSFVERS="${GITTAG}" 21 + NSFVERSEXTRA="" 22 + SRC="src/nsf${GITTAG}.zip" 23 + SRCURL="http://fisheye.openacs.org/browse/~tarball=zip,br=${GITTAG}/nsf/nsf.zip" 24 + SRCHASH='-' 25 +else 26 + NSFVERS="2.0.0" 27 + NSFVERSEXTRA="" 28 + SRC="src/nsf${NSFVERS}.tar.gz" 29 + SRCURL="http://sourceforge.net/projects/next-scripting/files/${NSFVERS}/nsf${NSFVERS}.tar.gz/download" 30 + SRCHASH='-' 31 +fi 32 + 19 33 BUILDDIR="$(pwd)/build/nsf${NSFVERS}" 20 34 OUTDIR="$(pwd)/out" 21 35 INSTDIR="$(pwd)/inst" 22 36 export NSFVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR 23 37 24 38 # Set configure options for this sub-project 25 39 LDFLAGS="${LDFLAGS} ${KC_NSF_LDFLAGS}" ................................................................................ 39 53 fi 40 54 fi 41 55 42 56 ( 43 57 cd 'build' || exit 1 44 58 45 59 if [ ! -d '../buildsrc' ]; then 46 - gzip -dc "../${SRC}" | tar -xf - 60 + if [ "${use_git}" = "1" ]; then 61 + unzip "../${SRC}" -d nsf${NSFVERS} 62 + else 63 + gzip -dc "../${SRC}" | tar -xf - 64 + fi 47 65 else 48 66 cp -rp ../buildsrc/* './' 49 67 fi 50 68 51 69 cd "${BUILDDIR}" || exit 1 70 + 71 + if [ "${use_git}" = "1" ]; then 72 + ## the GIT zip tarball does not preserve file permissions (configure) 73 + rm -rf configure 74 + autoconf || exit 1 75 + fi 76 + 52 77 53 78 # There's a STATIC<packageInAllUpperCase>=-1,0,1 54 79 # ... where -1 means no (i.e., shared), 55 80 # ... 0 means try not to (try shared first, if that 56 81 # doesn't work do static), 57 82 # ... and 1 means try to (try only static) 58 83 ................................................................................ 118 143 echo "Running: ${MAKE:-make} install TCLSH=${TCLSH_NATIVE}" 119 144 ${MAKE:-make} install TCLSH=${TCLSH_NATIVE} || exit 1 120 145 121 146 ) || continue 122 147 123 148 break 124 149 done 150 + 151 + if [ "${use_git}" = "1" ]; then 152 + NSFVERS="$(source nsfConfig.sh && echo ${NSF_PATCH_LEVEL})" 153 + echo "GITNSFVERS=${NSFVERS}" 154 + fi 155 + 125 156 126 157 mkdir "${OUTDIR}/lib" || exit 1 127 158 cp -r "${INSTDIR}/lib"/nsf*/serialize "${OUTDIR}/lib/nsf${NSFVERS}-serialize" 128 159 cp -r "${INSTDIR}/lib"/nsf*/lib "${OUTDIR}/lib/nsf${NSFVERS}-lib" 129 160 cp -r "${INSTDIR}/lib"/nsf*/nx "${OUTDIR}/lib/nsf${NSFVERS}-nx" 130 161 cp -r "${INSTDIR}/lib"/nsf*/xotcl "${OUTDIR}/lib/nsf${NSFVERS}-xotcl" 131 162