Commit 62d5b9c0 authored by Jamie Hall's avatar Jamie Hall
Browse files

CI

parent 88564f0c
Pipeline #271 skipped
......@@ -93,7 +93,7 @@ rm -rf dist/MDANSE.app/Contents/Resources/lib/python2.7/matplotlib/tests
rm -rf dist/MDANSE.app/Contents/Resources/mpl-data/sample_data
#Add MDANSE version file (should read the version from the bundle with pyobjc, but will figure that out later)
echo "${CI_BUILD_TAG"> dist/MDANSE.app/Contents/Resources/version
echo "${CI_BUILD_TAG" > dist/MDANSE.app/Contents/Resources/version
MDANSE_DMG=MDANSE-${CI_BUILD_TAG}-${BUILD_TARGET}.dmg
......@@ -104,6 +104,6 @@ hdiutil unmount /Volumes/MDANSE -force -quiet
sleep 5
../Tools/create-dmg/create-dmg --background "../Resources/background.jpg" --volname "MDANSE" --window-pos 200 120 --window-size 800 400 --icon MDANSE.app 200 190 --hide-extension MDANSE.app --app-drop-link 600 185 ${MDANSE_DMG} ./dist
../Tools/create-dmg/create-dmg --background "../Resources/background.jpg" --volname "MDANSE" --window-pos 200 120 --window-size 800 400 --icon MDANSE.app 200 190 --hide-extension MDANSE.app --app-drop-link 600 185 "${MDANSE_DMG}" ./dist
exit
......@@ -53,7 +53,7 @@ cd ../../..
echo "$BLEU""Build debian tree" "$NORMAL"
DEBIAN_ROOT_DIR=debian_${DISTRO}-${ARCH}
DEBIAN_ROOT_DIR=BuildServer/Debian/Build
# Copy all the debian files (e.g. control, copyright, md5sum ...) into DEBIAN directory
mkdir ${DEBIAN_ROOT_DIR}
......@@ -85,4 +85,4 @@ cp -r /usr/local/lib/python2.7/dist-packages/Scientific* ${DEBIAN_DIST_DIR}
cp -r /usr/local/lib/python2.7/dist-packages/MMTK* ${DEBIAN_DIST_DIR}
export TMPDIR=.
fakeroot dpkg-deb -b ${DEBIAN_ROOT_DIR} MDANSE-${CI_BUILD_TAG}-${DISTRO}-${ARCH}.deb
fakeroot dpkg-deb -b ${DEBIAN_ROOT_DIR} ${DEBIAN_ROOT_DIR}/MDANSE-${CI_BUILD_TAG}-${DISTRO}-${ARCH}.deb
......@@ -15,7 +15,7 @@
Name "MDANSE ${VERSION}"
; The name of the installer file to write
OutFile "MDANSE-${VERSION}-${ARCH}.exe"
OutFile "${TARGET_DIR}\MDANSE-${VERSION}-${ARCH}.exe"
RequestExecutionLevel admin #NOTE: You still need to check user rights with UserInfo!
......@@ -99,7 +99,7 @@ Section "MDANSE ${VERSION}" SEC01
SetShellVarContext all
SetOutPath "$INSTDIR"
SetOverwrite on
File /r /x *.pyc /x *.pyo /x *.log /x *.egg-info "${PYTHON_INST}\*"
File /r /x *.pyc /x *.pyo /x *.log /x *.egg-info "${TARGET_DIR}\*"
File "CHANGELOG.txt"
File "LICENSE.txt"
File "MDANSE_launcher.bat"
......@@ -119,7 +119,7 @@ Section "MDANSE ${VERSION}" SEC01
CreateShortCut "$SMPROGRAMS\Institut Laue-Langevin\MDANSE\MDANSE_command_shell.lnk" \
"$SYSDIR\cmd.exe" \
'/K "$INSTDIR\MDANSE_command_shell.bat"' \
"${ICONS_DIR}\terminal.ico" 0
"${ICONS_DIR}\terminal.ico" 0
WriteIniStr "$INSTDIR\MDANSE.url" "InternetShortcut" "URL" "${WEB_SITE}"
CreateShortCut "$SMPROGRAMS\Institut Laue-Langevin\MDANSE\Website.lnk" "$INSTDIR\MDANSE.url" "" "${ICONS_DIR}\web.ico" 0
CreateShortCut "$SMPROGRAMS\Institut Laue-Langevin\MDANSE\Uninstall.lnk" "$INSTDIR\uninst.exe" "" "${ICONS_DIR}\uninstall.ico" 0
......@@ -130,7 +130,7 @@ Section "MDANSE ${VERSION}" SEC01
WriteRegStr ${UNINST_ROOT_KEY} "${UNINST_KEY}" "DisplayVersion" "${VERSION}"
WriteRegStr ${UNINST_ROOT_KEY} "${UNINST_KEY}" "URLInfoAbout" "${WEB_SITE}"
WriteRegStr ${UNINST_ROOT_KEY} "${UNINST_KEY}" "Publisher" "${PUBLISHER}"
WriteUninstaller "$INSTDIR\uninst.exe"
SetAutoClose false
SectionEnd
......@@ -155,7 +155,7 @@ Section uninstall
Delete "${ICONS_DIR}\web.ico"
Delete "$DESKTOP\MDANSE.lnk"
Delete "$SMPROGRAMS\Institut Laue-Langevin\MDANSE\MDANSE_command_shell.lnk"
Delete "$SMPROGRAMS\Institut Laue-Langevin\MDANSE\Uninstall.lnk"
Delete "$SMPROGRAMS\Institut Laue-Langevin\MDANSE\Website.lnk"
......@@ -165,4 +165,4 @@ Section uninstall
DeleteRegKey ${UNINST_ROOT_KEY} "${UNINST_KEY}"
SetAutoClose false
SectionEnd
\ No newline at end of file
SectionEnd
......@@ -40,7 +40,7 @@ CI_PROJECT_DIR_WIN=$(cygpath -a -w ${CI_PROJECT_DIR})
SCRIPT_DIR="${CI_PROJECT_DIR}/BuildServer/Windows"
# This is the directory that will contain the temporary installation
TARGET_DIR="${CI_PROJECT_DIR_WIN}\\BuildServer\\Windows\\${BUILD_TARGET}"
TARGET_DIR="${CI_PROJECT_DIR_WIN}\\BuildServer\\Windows\\Build"
TARGET_DIR_CYGWIN=$(cygpath -u $TARGET_DIR)
function extract
......@@ -208,7 +208,7 @@ elif [ $TASK = "build" ]; then
# Add current revision number to python source code (will appear in "About..." dialog)
sed -i "/__version__/c\__version__ = '${CI_BUILD_TAG}'" MDANSE/__pkginfo__.py
sed -i "/__revision__/c\__revision__ = '${REV_NUMBER}'/" MDANSE/__pkginfo__.py
sed -i "/__revision__/c\__revision__ = '${REV_NUMBER}'" MDANSE/__pkginfo__.py
# setup the environment for a visual studio build of MDANSE using microsoft SDK 7.0 and build MDANSE
echo "MDANSE setup and build"
......@@ -246,5 +246,5 @@ elif [ $TASK = "build" ]; then
# create the MDANSE installer
echo "Creating nsis installer for target ${BUILD_TARGET}..."
makensis /V4 /ONSISlog.txt /DVERSION=${CI_BUILD_TAG} /DARCH=${BUILD_TARGET} /DPYTHON_INST="${TARGET_DIR}" MDANSE_installer.nsi
makensis /V4 /ONSISlog.txt /DVERSION=${CI_BUILD_TAG} /DARCH=${BUILD_TARGET} /DTARGET_DIR="${TARGET_DIR}" MDANSE_installer.nsi
fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment