diff options
| author | Kenneth Skovhede <kenneth@hexad.dk> | 2016-06-28 11:04:25 +0300 |
|---|---|---|
| committer | Kenneth Skovhede <kenneth@hexad.dk> | 2016-06-28 11:04:25 +0300 |
| commit | c956a45364073dacd3f7ee4c2d0544985fd49d7e (patch) | |
| tree | ed8441af95a46e0b882459e365c2b18eb989ee50 | |
| parent | 8c7811ae89c77073bd975863f0e724d686696a68 (diff) | |
Updated build scripts to use nuget as that is now required to pull most thirdparty packages
| -rwxr-xr-x | Installer/debian/debian/rules | 5 | ||||
| -rwxr-xr-x | Installer/fedora/duplicati.spec | 1 | ||||
| -rw-r--r-- | build-release.sh | 8 |
3 files changed, 13 insertions, 1 deletions
diff --git a/Installer/debian/debian/rules b/Installer/debian/debian/rules index 5ede76731..0483dcea3 100755 --- a/Installer/debian/debian/rules +++ b/Installer/debian/debian/rules @@ -32,6 +32,11 @@ override_dh_clean: override_dh_auto_build: xbuild /property:Configuration=Release BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj mono BuildTools/UpdateVersionStamp/bin/Release/UpdateVersionStamp.exe --version=$(VERSION) + + xbuild /property:Configuration=Release thirdparty/UnixSupport/UnixSupport.csproj + cp thirdparty/UnixSupport/bin/Release/UnixSupport.dll thirdparty/UnixSupport/UnixSupport.dll + + nuget restore Duplicati.sln xbuild /property:Configuration=Release Duplicati.sln override_dh_auto_install: diff --git a/Installer/fedora/duplicati.spec b/Installer/fedora/duplicati.spec index 04038313b..5afd9e5c0 100755 --- a/Installer/fedora/duplicati.spec +++ b/Installer/fedora/duplicati.spec @@ -121,6 +121,7 @@ mono BuildTools/UpdateVersionStamp/bin/Release/UpdateVersionStamp.exe --version= xbuild /property:Configuration=Release thirdparty/UnixSupport/UnixSupport.csproj cp thirdparty/UnixSupport/bin/Release/UnixSupport.dll thirdparty/UnixSupport/UnixSupport.dll +nuget restore Duplicati.sln xbuild /property:Configuration=Release Duplicati.sln # xbuild BuildTools/LocalizationTool/LocalizationTool.sln diff --git a/build-release.sh b/build-release.sh index 8b75d8bfd..e38b1f8e6 100644 --- a/build-release.sh +++ b/build-release.sh @@ -26,6 +26,7 @@ UPDATER_KEYFILE="${HOME}/Dropbox/Privat/Duplicati-updater-release.key" GPG_KEYFILE="${HOME}/Dropbox/Privat/Duplicati-updater-gpgkey.key" GITHUB_TOKEN_FILE="${HOME}/.config/github-api-token" XBUILD=/Library/Frameworks/Mono.framework/Commands/xbuild +NUGET=/Library/Frameworks/Mono.framework/Commands/nuget GPG=/usr/local/bin/gpg2 if [ "${RELEASE_TYPE}" == "nightly" ]; then @@ -89,7 +90,12 @@ fi rm -rf "Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Release" -mono "BuildTools/UpdateVersionStamp/bin/Debug/UpdateVersionStamp.exe" --version="${RELEASE_VERSION}" +${XBUILD} /property:Configuration=Release BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj +mono "BuildTools/UpdateVersionStamp/bin/Release/UpdateVersionStamp.exe" --version="${RELEASE_VERSION}" + +${NUGET} restore "BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.sln" +${NUGET} restore Duplicati.sln + ${XBUILD} /p:Configuration=Debug "BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.sln" ${XBUILD} /p:Configuration=Release Duplicati.sln |