diff --git a/BookmarkManager.csproj b/BookmarkManager.csproj index 297e230..6d6b597 100644 --- a/BookmarkManager.csproj +++ b/BookmarkManager.csproj @@ -14,7 +14,7 @@ Ray Lam 1.0.0.0 1.0.0.0 - 0.5.0.011 + 0.5.0.012 bookmarkmanager True diff --git a/References/Ryz3ui.dll b/References/Ryz3ui.dll index be95657..f77c4e4 100644 Binary files a/References/Ryz3ui.dll and b/References/Ryz3ui.dll differ diff --git a/installer-64.iss b/build-installer.iss similarity index 78% rename from installer-64.iss rename to build-installer.iss index 843ab8a..92ee27b 100644 --- a/installer-64.iss +++ b/build-installer.iss @@ -2,11 +2,15 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Bookmark Manager" -#define MyAppVersion "0.5.0.011" +#define MyAppVersion "0.5.0.012" #define MyAppPublisher "Hi, I'm Ray" #define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager" #define MyAppExeName "bookmarkmanager.exe" +#define AppSourcePath "L:\gitea-hiimray\bookmark-manager-r4\bin\Release\64" +#define AppReleasePath "L:\gitea-hiimray\bookmark-manager-r4\bin\Release" +#define AppReleaseName "bookmark-manager" + [Setup] ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) @@ -22,8 +26,8 @@ DefaultGroupName={#MyAppName} DisableProgramGroupPage=yes ; Remove the following line to run in administrative install mode (install for all users.) PrivilegesRequired=lowest -OutputDir=L:\gitlab-hiimray\bookmark-manager-r4\bin -OutputBaseFilename=bookmark-manager +OutputDir={#AppReleasePath} +OutputBaseFilename={#AppReleaseName} Compression=lzma SolidCompression=yes WizardStyle=modern @@ -35,8 +39,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "L:\gitea-hiimray\bookmark-manager-r4\bin\Release\64\bookmarkmanager.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "L:\gitea-hiimray\bookmark-manager-r4\bin\Release\64\e_sqlite3.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#AppSourcePath}\bookmarkmanager.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#AppSourcePath}\e_sqlite3.dll"; DestDir: "{app}"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..abe9789 --- /dev/null +++ b/build.bat @@ -0,0 +1,7 @@ +rmdir /s /q "bin\Release\" +dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\64\" + +"C:\B\Portable Files (dev)\Inno Setup\v6.0.4-2\app\ISCC.exe" "build-installer.iss" + +cd "bin\Release\64\" +"C:\B\Portable Files\PeaZip (Portable)\v6.5.1\App\PeaZip\res\7z\7z.exe" a -t7z "..\bookmark-manager.7z" "*" -mx9 \ No newline at end of file diff --git a/build64.bat b/build64.bat deleted file mode 100644 index 346433b..0000000 --- a/build64.bat +++ /dev/null @@ -1,2 +0,0 @@ -rmdir /s /q "bin\Release\64\" -dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\64\"