diff --git a/Duplicati/Library/AutoUpdater/AutoUpdateSignKey.txt b/Duplicati/Library/AutoUpdater/AutoUpdateSignKey.txt index 01b1eda73b..736377a578 100644 --- a/Duplicati/Library/AutoUpdater/AutoUpdateSignKey.txt +++ b/Duplicati/Library/AutoUpdater/AutoUpdateSignKey.txt @@ -1 +1 @@ -hAQowZDOHUng9erCNk/dWTDjmj4RPQ1aU3l6VPwt+pJo+Axd7BFw6VC+tcCe5ArA/KTuRleVER0ARdWMAl5dGaAzbXrUhYBPCBnamMJomddAYQniKUwMbH1QYLlLy/My+BVqCYFYRubc+Mwb0vPvXQgaXGOI4DrVC/85KIXzyIc=EQ== +krad8Af4dJQfasOtYpThF5b0ZJW0p4gt2hNQx0vHOuoOXSWqh7mk+XhrF1G3WHkzbBops/VphjtEWOWM6Duh+/4e5NviiGovDVD8g/EWXa336SB04vF6U3CoIAFw3T+ZAAv0Ovmywcu71a8unEbgPWlIsWITvWzo7Et+TdTOBYM=EQ== \ No newline at end of file diff --git a/Duplicati/Library/AutoUpdater/AutoUpdateURL.txt b/Duplicati/Library/AutoUpdater/AutoUpdateURL.txt index 5623cac9a3..65455b03a8 100644 --- a/Duplicati/Library/AutoUpdater/AutoUpdateURL.txt +++ b/Duplicati/Library/AutoUpdater/AutoUpdateURL.txt @@ -1 +1 @@ -http://updates.duplicati.com/debug/latest.manifest;http://alt.updates.duplicati.com/debug/latest.manifest +http://updates.duplicati.com/preview/latest.manifest;http://alt.updates.duplicati.com/preview/latest.manifest diff --git a/Updates/build_version.txt b/Updates/build_version.txt new file mode 100644 index 0000000000..21e72e8ac3 --- /dev/null +++ b/Updates/build_version.txt @@ -0,0 +1 @@ +48 diff --git a/Updates/debug_urls.txt b/Updates/debug_urls.txt deleted file mode 100644 index 5623cac9a3..0000000000 --- a/Updates/debug_urls.txt +++ /dev/null @@ -1 +0,0 @@ -http://updates.duplicati.com/debug/latest.manifest;http://alt.updates.duplicati.com/debug/latest.manifest diff --git a/Updates/debug_version.txt b/Updates/debug_version.txt deleted file mode 100644 index 60d3b2f4a4..0000000000 --- a/Updates/debug_version.txt +++ /dev/null @@ -1 +0,0 @@ -15 diff --git a/Updates/preview.manifest b/Updates/preview.manifest new file mode 100644 index 0000000000..f1efe90eba --- /dev/null +++ b/Updates/preview.manifest @@ -0,0 +1,3 @@ +{ + "ReleaseType": "Preview", +} \ No newline at end of file diff --git a/Updates/release_changeinfo.txt b/Updates/release_changeinfo.txt new file mode 100644 index 0000000000..c4ef80ad79 --- /dev/null +++ b/Updates/release_changeinfo.txt @@ -0,0 +1 @@ +Test release \ No newline at end of file diff --git a/Updates/release_key.txt b/Updates/release_key.txt new file mode 100644 index 0000000000..736377a578 --- /dev/null +++ b/Updates/release_key.txt @@ -0,0 +1 @@ +krad8Af4dJQfasOtYpThF5b0ZJW0p4gt2hNQx0vHOuoOXSWqh7mk+XhrF1G3WHkzbBops/VphjtEWOWM6Duh+/4e5NviiGovDVD8g/EWXa336SB04vF6U3CoIAFw3T+ZAAv0Ovmywcu71a8unEbgPWlIsWITvWzo7Et+TdTOBYM=EQ== \ No newline at end of file diff --git a/build-debug-update.sh b/build-debug-update.sh index c28ffb4d1d..289c581382 100755 --- a/build-debug-update.sh +++ b/build-debug-update.sh @@ -1,6 +1,6 @@ RELEASE_TIMESTAMP=`date +%Y-%m-%d` -RELEASE_INC_VERSION=`cat Updates/debug_version.txt` +RELEASE_INC_VERSION=`cat Updates/build_version.txt` RELEASE_INC_VERSION=$((RELEASE_INC_VERSION+1)) RELEASE_NAME=2.0_CLI_experimental_${RELEASE_TIMESTAMP} @@ -8,7 +8,8 @@ RELEASE_CHANGEINFO=`cat Updates/debug_changeinfo.txt` RELEASE_VERSION="2.0.0.${RELEASE_INC_VERSION}" UPDATE_ZIP_URLS=http://updates.duplicati.com/debug/duplicati.zip\;http://alt.updates.duplicati.com/debug/duplicati.zip -UPDATER_KEYFILE=/Users/kenneth/Dropbox/Privat/Duplicati-updater.key +UPDATE_MANIFEST_URLS=http://updates.duplicati.com/debug/latest.manifest\;http://alt.updates.duplicati.com/debug/latest.manifest +UPDATER_KEYFILE=/Users/kenneth/Dropbox/Privat/Duplicati-updater-debug.key if [ "x${RELEASE_CHANGEINFO}" == "x" ]; then echo "No information in changeinfo file" @@ -20,10 +21,10 @@ read -s KEYFILE_PASSWORD echo echo "${RELEASE_NAME}" > Duplicati/License/VersionTag.txt -cp "Updates/debug_urls.txt" Duplicati/Library/AutoUpdater/AutoUpdateURL.txt +echo "${UPDATE_MANIFEST_URLS}" > Duplicati/Library/AutoUpdater/AutoUpdateURL.txt cp "Updates/debug_key.txt" Duplicati/Library/AutoUpdater/AutoUpdateSignKey.txt -#rm -rf Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Debug +rm -rf Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Debug mono BuildTools/UpdateVersionStamp/bin/Debug/UpdateVersionStamp.exe --version="${RELEASE_VERSION}" xbuild /p:Configuration=Debug BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.sln @@ -37,8 +38,8 @@ fi if [ ! -d "Updates/build" ]; then mkdir "Updates/build"; fi -UPDATE_SOURCE=Updates/build/update_source-${RELEASE_TIMESTAMP} -UPDATE_TARGET=Updates/build/update_target-${RELEASE_TIMESTAMP} +UPDATE_SOURCE=Updates/build/debug_source-${RELEASE_VERSION} +UPDATE_TARGET=Updates/build/debug_target-${RELEASE_VERSION} if [ -e "${UPDATE_SOURCE}" ]; then rm -rf "${UPDATE_SOURCE}"; fi if [ -e "${UPDATE_TARGET}" ]; then rm -rf "${UPDATE_TARGET}"; fi @@ -49,20 +50,19 @@ mkdir "${UPDATE_TARGET}" cp -R Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Debug/* "${UPDATE_SOURCE}" cp -R Duplicati/Server/webroot "${UPDATE_SOURCE}" -rm ${UPDATE_SOURCE}/*.mdb if [ -e "${UPDATE_SOURCE}/control_dir" ]; then rm -rf "${UPDATE_SOURCE}/control_dir"; fi if [ -e "${UPDATE_SOURCE}/Duplicati-server.sqlite" ]; then rm "${UPDATE_SOURCE}/Duplicati-server.sqlite"; fi if [ -e "${UPDATE_SOURCE}/Duplicati.debug.log" ]; then rm "${UPDATE_SOURCE}/Duplicati.debug.log"; fi if [ -e "${UPDATE_SOURCE}/updates" ]; then rm -rf "${UPDATE_SOURCE}/updates"; fi -rm -rf "${UPDATE_SOURCE}/updates/"*.mdb; -rm -rf "${UPDATE_SOURCE}/updates/"*.pdb; +rm -rf "${UPDATE_SOURCE}/"*.mdb; +rm -rf "${UPDATE_SOURCE}/"*.pdb; echo echo "Building signed package ..." mono BuildTools/AutoUpdateBuilder/bin/Debug/AutoUpdateBuilder.exe --input="${UPDATE_SOURCE}" --output="${UPDATE_TARGET}" --keyfile="${UPDATER_KEYFILE}" --manifest=Updates/debug.manifest --changeinfo="${RELEASE_CHANGEINFO}" --displayname="${RELEASE_NAME}" --remoteurls="${UPDATE_ZIP_URLS}" --version="${RELEASE_VERSION}" --keyfile-password="$KEYFILE_PASSWORD" -echo "${RELEASE_INC_VERSION}" > "Updates/debug_version.txt" +echo "${RELEASE_INC_VERSION}" > "Updates/build_version.txt" mv "${UPDATE_TARGET}/package.zip" "${UPDATE_TARGET}/duplicati.zip" mv "${UPDATE_TARGET}/autoupdate.manifest" "${UPDATE_TARGET}/latest.manifest" diff --git a/build-preview-update.sh b/build-preview-update.sh new file mode 100755 index 0000000000..bd463a1c06 --- /dev/null +++ b/build-preview-update.sh @@ -0,0 +1,76 @@ +RELEASE_TIMESTAMP=`date +%Y-%m-%d` + +RELEASE_INC_VERSION=`cat Updates/build_version.txt` +RELEASE_INC_VERSION=$((RELEASE_INC_VERSION+1)) + +RELEASE_NAME=2.0_preview_${RELEASE_TIMESTAMP} +RELEASE_CHANGEINFO=`cat Updates/release_changeinfo.txt` +RELEASE_VERSION="2.0.0.${RELEASE_INC_VERSION}" + +UPDATE_ZIP_URLS=http://updates.duplicati.com/preview/duplicati.zip\;http://alt.updates.duplicati.com/preview/duplicati.zip +UPDATE_MANIFEST_URLS=http://updates.duplicati.com/preview/latest.manifest\;http://alt.updates.duplicati.com/preview/latest.manifest +UPDATER_KEYFILE=/Users/kenneth/Dropbox/Privat/Duplicati-updater-release.key + +if [ "x${RELEASE_CHANGEINFO}" == "x" ]; then + echo "No information in changeinfo file" + exit 0 +fi + +echo -n "Enter keyfile password: " +read -s KEYFILE_PASSWORD +echo + +echo "${RELEASE_NAME}" > Duplicati/License/VersionTag.txt +echo "${UPDATE_MANIFEST_URLS}" > Duplicati/Library/AutoUpdater/AutoUpdateURL.txt +cp "Updates/release_key.txt" Duplicati/Library/AutoUpdater/AutoUpdateSignKey.txt + +rm -rf Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Release + +mono BuildTools/UpdateVersionStamp/bin/Debug/UpdateVersionStamp.exe --version="${RELEASE_VERSION}" +xbuild /p:Configuration=Debug BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.sln +xbuild /p:Configuration=Release Duplicati.sln +BUILD_STATUS=$? + +if [ "${BUILD_STATUS}" -ne 0 ]; then + echo "Failed to build, xbuild gave ${BUILD_STATUS}, exiting" + exit 4 +fi + +if [ ! -d "Updates/build" ]; then mkdir "Updates/build"; fi + +UPDATE_SOURCE=Updates/build/preview_source-${RELEASE_VERSION} +UPDATE_TARGET=Updates/build/preview_target-${RELEASE_VERSION} + +if [ -e "${UPDATE_SOURCE}" ]; then rm -rf "${UPDATE_SOURCE}"; fi +if [ -e "${UPDATE_TARGET}" ]; then rm -rf "${UPDATE_TARGET}"; fi + +mkdir "${UPDATE_SOURCE}" +mkdir "${UPDATE_TARGET}" + +cp -R Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Release/* "${UPDATE_SOURCE}" +cp -R Duplicati/Server/webroot "${UPDATE_SOURCE}" + +if [ -e "${UPDATE_SOURCE}/control_dir" ]; then rm -rf "${UPDATE_SOURCE}/control_dir"; fi +if [ -e "${UPDATE_SOURCE}/Duplicati-server.sqlite" ]; then rm "${UPDATE_SOURCE}/Duplicati-server.sqlite"; fi +if [ -e "${UPDATE_SOURCE}/Duplicati.debug.log" ]; then rm "${UPDATE_SOURCE}/Duplicati.debug.log"; fi +if [ -e "${UPDATE_SOURCE}/updates" ]; then rm -rf "${UPDATE_SOURCE}/updates"; fi +rm -rf "${UPDATE_SOURCE}/"*.mdb; +rm -rf "${UPDATE_SOURCE}/"*.pdb; + +echo +echo "Building signed package ..." + +mono BuildTools/AutoUpdateBuilder/bin/Debug/AutoUpdateBuilder.exe --input="${UPDATE_SOURCE}" --output="${UPDATE_TARGET}" --keyfile="${UPDATER_KEYFILE}" --manifest=Updates/preview.manifest --changeinfo="${RELEASE_CHANGEINFO}" --displayname="${RELEASE_NAME}" --remoteurls="${UPDATE_ZIP_URLS}" --version="${RELEASE_VERSION}" --keyfile-password="$KEYFILE_PASSWORD" + +echo "${RELEASE_INC_VERSION}" > "Updates/build_version.txt" + +mv "${UPDATE_TARGET}/package.zip" "${UPDATE_TARGET}/duplicati.zip" +mv "${UPDATE_TARGET}/autoupdate.manifest" "${UPDATE_TARGET}/latest.manifest" + +mono BuildTools/UpdateVersionStamp/bin/Debug/UpdateVersionStamp.exe --version="2.0.0.7" + +echo +echo "Built DEBUG version: ${RELEASE_VERSION} - ${RELEASE_NAME}" +echo " in folder: ${UPDATE_TARGET}" + +