[Gtk2hs-commit] (main branch): win32: more changes to the build scripts

[Peter g. <pg...@co...>]

Wed Jan 21 00:37:54 EST 2009  Peter Gavin <pg...@gm...>
  * win32: more changes to the build scripts

    hunk ./tools/win32/gtk2hs.iss 440
    +  BaseDir: String;[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 443
    -  PackageLibDir := ExpandConstant('{app}') + '\lib\gtk2hs';[_^M_][_$_]
    +  BaseDir := ExpandConstant('{app}');[_^M_][_$_]
    +  PackageLibDir := BaseDir + '\lib\gtk2hs';[_^M_][_$_]
    +  StringChange(BaseDir, '\', '/');[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 451
    -  StringChange(PackageFileContent, '${GTK_BASEPATH}', PackageLibDir);[_^M_][_$_]
    +  StringChange(PackageFileContent, '${GTK_BASEPATH}', BaseDir);[_^M_][_$_]
    hunk ./tools/win32/win32-build-version.sh 12
    -BUILD_DIR="build-${VERSIONED_DIR}"
    +BUILD_DIR="`pwd`/build-${VERSIONED_DIR}"
    hunk ./tools/win32/win32-build-version.sh 20
    -  cd ${BUILD_DIR}
    +  pushd ${BUILD_DIR}
    hunk ./tools/win32/win32-build-version.sh 23
    -  cd ${BUILD_DIR}
    +  pushd ${BUILD_DIR}
    hunk ./tools/win32/win32-build-version.sh 34
    -make HSTOOLFLAGS=-M256m
    -make install DESTDIR="$DESTDIR"
    +make HSTOOLFLAGS=-M256m || exit 1
    +make install DESTDIR="$DESTDIR" || exit 1
    hunk ./tools/win32/win32-build-version.sh 47
    -cp -av $PREFIX/* ${INSTALL_CLIBS_DIR} || exit 1
    -mv -v ${DESTDIR}/${PREFIX}/lib ${INSTALL_GHC_LIBS_DIR} || exit 1
    +cp -a $PREFIX/* ${INSTALL_CLIBS_DIR} || exit 1
    +mv ${DESTDIR}/${PREFIX}/lib ${INSTALL_GHC_LIBS_DIR} || exit 1
    hunk ./tools/win32/win32-build-version.sh 50
    -mv -v ${DESTDIR}/${PREFIX}/share/doc/gtk2hs/html ${INSTALL_DOC_DIR}/share/doc || exit 1
    +mv ${DESTDIR}/${PREFIX}/share/doc/gtk2hs/html ${INSTALL_DOC_DIR}/share/doc || exit 1
    hunk ./tools/win32/win32-build-version.sh 52
    -cp -av ${BUILD_DIR}/gtk2hs-${VERSION}/demo/* ${INSTALL_DEMO_DIR}/share/demo/ || exit 1
    +cp -a ${BUILD_DIR}/gtk2hs-${VERSION}/demo/* ${INSTALL_DEMO_DIR}/share/demo/ || exit 1
    hunk ./tools/win32/win32-build-version.sh 54
    -rm -rf ${BUILD_DIR}
    +popd
    +rm -rf ${BUILD_DIR} ${DESTDIR}