BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Upgrade to 1.2.1

Browse Source
This commit is contained in:
Scott E. Graves
2017-04-25 21:13:23 -05:00
parent 6a17c04ba8
commit bf1c7c595e
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.3)
#Common Configuration Pre-setup
set(SIADRIVE_VERSION 0.1_Alpha1)
set(SIA_VERSION 1.2.1)
string(REPLACE "\\" "/" SIADRIVE_INSTALL_FOLDER ${SIADRIVE_INSTALL_FOLDER})
set(EXTERNAL_BUILD_ROOT ${CMAKE_BINARY_DIR}/external)
set(EXTERNAL_BUILD_TYPE ${CMAKE_BUILD_TYPE})

2
SiaDrive_Packager.iss.in
View File

@@ -35,7 +35,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "main"; Description: "SiaDrive Files"; Types: full compact custom; Flags: fixed
Name: "vc_runtime"; Description: "Visual C++ 2015 Redistributable"; Types: full custom
Name: "dokany"; Description: "Dokany v1.0.3"; Types: full custom
Name: "sia"; Description: "Sia v1.2.0"; Types: full custom
Name: "sia"; Description: "Sia v@SIA_VERSION@"; Types: full custom
[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; Components: main

2
include/siadrive_api/siacommon.h.in
View File

@@ -3,7 +3,7 @@
#include <cstdint>
#define SIADRIVE_VERSION_STRING "@SIADRIVE_VERSION@"
#define COMPAT_SIAD_VERSION "1.2.0"
#define COMPAT_SIAD_VERSION "@SIA_VERSION@"
#ifdef _WIN32
// Disable DLL-interface warnings

14
package.cmd
View File

@@ -3,6 +3,7 @@
set ROOT=%~dp0%
set PATH=%ROOT%bin;%PATH%
set MODE=%1
set SIA_VERSION=v1.2.1
pushd "%ROOT%"
@@ -15,13 +16,14 @@ pushd 3rd_party
wget --no-check-certificate https://download.microsoft.com/download/6/D/F/6DF3FF94-F7F9-4F0B-838C-A328D1A7D0EE/vc_redist.x64.exe || goto :ERROR
)
if not exist "sia.complete" (
if not exist "Sia-v1.2.0-windows-amd64.zip" (
wget --no-check-certificate https://github.com/NebulousLabs/Sia/releases/download/v1.2.0/Sia-v1.2.0-windows-amd64.zip || goto :ERROR
if not exist "%SIA_VERSION%.complete" (
if not exist "Sia-%SIA_VERSION%-windows-amd64.zip" (
wget --no-check-certificate https://github.com/NebulousLabs/Sia/releases/download/%SIA_VERSION%/Sia-%SIA_VERSION%-windows-amd64.zip || goto :ERROR
)
unzip Sia-v1.2.0-windows-amd64.zip || goto :ERROR
move Sia-v1.2.0-windows-amd64 Sia || goto :ERROR
echo "1">sia.complete
rd /s /q Sia > NUL
unzip Sia-%SIA_VERSION%-windows-amd64.zip || goto :ERROR
move Sia-%SIA_VERSION%-windows-amd64 Sia || goto :ERROR
echo "1">%SIA_VERSION%.complete
)
if not exist "Dokan_x64.msi" (