diff --git a/.gitignore b/.gitignore index 90c5c49..e3bb147 100644 --- a/.gitignore +++ b/.gitignore @@ -370,3 +370,9 @@ curl_examples.txt GITHUB_ACCESS_TOKEN.bat /Tools/curl-7.84.0_4-win64-mingw.zip release_info.txt +/NSIS Installation/Plugins +/NSIS Installation/CompileInstaller.bat +/NSIS Installation/WeekNumber.nsi +/Installation/CompileInstaller.bat +/Installation/WeekNumber.nsi +/Installation/Plugins diff --git a/NSIS Installation/License.en-US.txt b/Installation/License.en-US.txt similarity index 100% rename from NSIS Installation/License.en-US.txt rename to Installation/License.en-US.txt diff --git a/NSIS Installation/License.sv-SE.txt b/Installation/License.sv-SE.txt similarity index 100% rename from NSIS Installation/License.sv-SE.txt rename to Installation/License.sv-SE.txt diff --git a/NSIS Installation/CompileInstaller.bat b/NSIS Installation/CompileInstaller.bat deleted file mode 100644 index 02cc670..0000000 --- a/NSIS Installation/CompileInstaller.bat +++ /dev/null @@ -1,38 +0,0 @@ -@ECHO OFF -TITLE Compiling WeekNumber installer... - -:: VARIABLES -SET "INSTALL_SCRIPT_FOLDER=%~dp0" -SET "INSTALL_SCRIPT_FOLDER=%INSTALL_SCRIPT_FOLDER:~0,-1%" -SET VERSION=%1 -SET NSIS_INSTALL_FOLDER="C:\Program Files (x86)\NSIS" -SET INSTALLER="%INSTALL_SCRIPT_FOLDER%\WeekNumber_%VERSION%_Installer.exe" -SET INSTALL_LOG="%INSTALL_SCRIPT_FOLDER%\WeekNumber_%VERSION%_Installer.log" -SET INSTALL_SCRIPT="%INSTALL_SCRIPT_FOLDER%\WeekNumber.nsi" - -:: CHECK IF COMPILER EXIST -IF NOT EXIST "%NSIS_INSTALL_FOLDER%\makensis.exe" CALL :ERROR 100 - -:: REMOVE EXISTING INSTALLER WITH SAME VERSION -IF EXIST %INSTALLER% DEL /F /Q %INSTALLER% >NUL 2>&1 - -:: COMPILE INSTALL SCRIPT -CD /D %NSIS_INSTALL_FOLDER% -ECHO %DATE% %TIME% Compiling %INSTALL_SCRIPT%... >%INSTALL_LOG% -makensis.exe /DVERSION=%VERSION% /V1 %INSTALL_SCRIPT% -SET RESULT=%ERRORLEVEL% -CD /D "%INSTALL_SCRIPT_FOLDER%" -ECHO %DATE% %TIME% Compile operation completed with result %RESULT% >>%INSTALL_LOG% - -:: RETURN RESULT -IF EXIST %INSTALLER% EXIT %RESULT% -CALL :ERROR %RESULT% - -:ERROR -SET ERROR_RESULT=%~1 -IF %ERROR_RESULT% EQU 100 ( - @ECHO %DATE% %TIME% NSIS not found. Installation script could not be compiled. >>%INSTALL_LOG% -) ELSE ( - @ECHO %DATE% %TIME% Installation script compilation failed with error code %ERROR_RESULT%. >>%INSTALL_LOG% -) -EXIT %ERROR_RESULT% \ No newline at end of file diff --git a/NSIS Installation/Plugins/Aero.zip b/NSIS Installation/Plugins/Aero.zip deleted file mode 100644 index 8a9e4c3..0000000 Binary files a/NSIS Installation/Plugins/Aero.zip and /dev/null differ diff --git a/NSIS Installation/Plugins/LockedList.zip b/NSIS Installation/Plugins/LockedList.zip deleted file mode 100644 index ad77dcb..0000000 Binary files a/NSIS Installation/Plugins/LockedList.zip and /dev/null differ diff --git a/NSIS Installation/Plugins/extracted/LockedList64.dll b/NSIS Installation/Plugins/extracted/LockedList64.dll deleted file mode 100644 index 2c6ce89..0000000 Binary files a/NSIS Installation/Plugins/extracted/LockedList64.dll and /dev/null differ diff --git a/NSIS Installation/Plugins/extracted/binU/nsisXML.dll b/NSIS Installation/Plugins/extracted/binU/nsisXML.dll deleted file mode 100644 index 0bde4c4..0000000 Binary files a/NSIS Installation/Plugins/extracted/binU/nsisXML.dll and /dev/null differ diff --git a/NSIS Installation/Plugins/extracted/nsisXML/License.txt b/NSIS Installation/Plugins/extracted/nsisXML/License.txt deleted file mode 100644 index cfefb36..0000000 --- a/NSIS Installation/Plugins/extracted/nsisXML/License.txt +++ /dev/null @@ -1,15 +0,0 @@ -nsisXML -- Small NSIS plugin to manipulate XML data through MSXML -Web site: http://wiz0u.free.fr/prog/nsisXML - -Copyright (c) 2005-2012 Olivier Marcoux - -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source distribution. - diff --git a/NSIS Installation/Plugins/extracted/nsisXML/ReadMe.txt b/NSIS Installation/Plugins/extracted/nsisXML/ReadMe.txt deleted file mode 100644 index 2235cb6..0000000 --- a/NSIS Installation/Plugins/extracted/nsisXML/ReadMe.txt +++ /dev/null @@ -1,168 +0,0 @@ -nsisXML -- Small NSIS plugin to manipulate XML data through MSXML -Web site: http://wiz0u.free.fr/prog/nsisXML ------------------------------------------------------------------ - -You can typically use it to: -- create, read, modify, write XML files -- create, remove, search XML nodes -- set/get nodes content or attributes - -Notes ------ -* For simplicity, I decided to use variables $0 through $3 for most parameters and - return values, instead of pushing/popping values using the stack - Therefore, avoid using these variables for something else while dealing with - nsisXML -* UTF8 text is generated for characters outside 7-bits ASCII range but I'm not - sure about codepage issue if the installer runs on a different codepage system - I suggest you don't supply constant strings in NSIS with such characters to - nsisXML. However strings based on the target system (like paths) should be ok. -* Newly-created XML file won't be nicely indented (but it's still correct XML !) - If you load, modify and save an XML file that was already indented, it will be - nicely indented (this is how MSXML works) -* Plugin requires, of course, that MSXML be already installed on the target system - It should run fine with any version of MSXML and will automatically use the most recent one. - Check MS Knowledge Base Q269238 for versions of MSXML shipped with Windows & Internet Explorer - (In summary: every computer that has IE 4.0, or more recent, has MSXML installed) - -Variables meaning ------------------ -$0 reference to the XML document root (integer) -$1 reference to a parent node (integer) -$2 reference to a child node (integer) -$3 depends - see functions description - -Usage ------ -nsisXML::create - creates an empty XML document in memory and returns its reference in $0 and $1 - -nsisXML::load - load given XML file into document $0 - REQUIRES that an XML document be already created in $0 - (if XML document $0 is not empty, all content will be discarded) - sets $0 to 0 if an error occured - -nsisXML::loadAndValidate - same as load but performs validation on the XML if a schema is present, and - resolves external definitions (may try to establish an Internet connection) - -nsisXML::save - saves current document $0 to given file - -nsisXML::createProcessingInstruction - creates a new 'processing instruction' node and return its reference in $2 - -nsisXML::createElement - creates a new element node with given tag name (initially empty) and return its - reference in $2 - -nsisXML::createElementInNS - creates a new element node with given tag name (initially empty) inside the given - namespace, and return its reference in $2 - -nsisXML::appendChild - appends node $2 as a child of node $1 - -nsisXML::insertBefore - insert node $2 as a child of node $1, to the left of node $3 - ($3 must be a reference to a child node of $1) - -nsisXML::setAttribute - sets the given attribute with the given value on node $2 - -nsisXML::getAttribute - returns in $3 the value for the given attribute name of node $2 - if attribute is not found, returns an empty string - -nsisXML::setText - sets the text content of the node $2 (<>the text between the tags) - -nsisXML::getText - returns in $3 the text content for node $2 - -nsisXML::select - find the first node matching the given XPath expression and return its - reference in $1 and $2 - if not found, reference will be 0 - -nsisXML::parentNode - returns in $1 the reference on the parent node of node $2 - -nsisXML::removeChild - removes node $2 from the childs list of node $1 - -nsisXML::release - release immediately the memory associated with given node (typically $2, $1 or $0) - for every nsisXML function that returns a node reference, you may want to release its memory after you're done working with the reference. - however, please note that in any case, all memory used by MSXML will be released when your installer terminates. - (so usually this is not a big concern) - - - - -Sample script #1 ------------------ - nsisXML::create - nsisXML::createProcessingInstruction "xml" 'version="1.0" encoding="UTF-8" standalone="yes"' - nsisXML::appendChild - nsisXML::createElement "main" ; create main document element node - nsisXML::appendChild - StrCpy $1 $2 ; lets move to this node and create its childs: - nsisXML::createElementInNS "child" "namespace" - nsisXML::setAttribute "attrib" "value" - nsisXML::setText "content" - nsisXML::appendChild - nsisXML::createElement "child" - nsisXML::setAttribute "attrib" "value2" - nsisXML::setAttribute "active" "yes" - nsisXML::setText "content2" - nsisXML::appendChild - nsisXML::save "Sample.xml" - -This script creates the following XML file: - -
contentcontent2
- -Sample script #2 ------------------ - nsisXML::create - nsisXML::load "Sample.xml" - nsisXML::select '/main/child[@attrib="value2"]' - IntCmp $2 0 notFound - nsisXML::getAttribute "active" - DetailPrint "Attribute 'active' is $3" - nsisXML::getText - DetailPrint "Tag contains $3" - nsisXML::parentNode - nsisXML::removeChild - nsisXML::save "Sample.xml" - -If applied on the previous "Sample.xml" file, this will print out "value2", -then "content2", and modify Sample.xml to become: - -
content
- -History -------- -2012-08-10: Added "createElementInNS" for xmlns (namespace) support -2010-04-02: Added "release" to prevent memory leaks. - Automatic use of most recent MSXML available - DLL is no longer unloaded after each call (you don't need /NOUNLOAD anymore) -2010-02-04: Added variant for Unicode NSIS -2006-03-22: Added "insertBefore" -2006-03-13: Modified "load". Added "loadAndValidation" - -License -------- -Copyright (c) 2005-2012 Olivier Marcoux - -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source distribution. diff --git a/NSIS Installation/Plugins/extracted/nsisXML/Sample.nsi b/NSIS Installation/Plugins/extracted/nsisXML/Sample.nsi deleted file mode 100644 index ae19f4c..0000000 --- a/NSIS Installation/Plugins/extracted/nsisXML/Sample.nsi +++ /dev/null @@ -1,56 +0,0 @@ -; nsisXML - Sample script - -!ifndef TARGETDIR -!ifdef NSIS_UNICODE -!define TARGETDIR "..\binU" -!else -!define TARGETDIR "..\bin" -!endif -!endif - -!addplugindir "${TARGETDIR}" - -Name "Sample nsisXML" -OutFile "Sample.exe" -ShowInstDetails show - -Section "Main program" - nsisXML::create - nsisXML::createProcessingInstruction "xml" 'version="1.0" encoding="UTF-8" standalone="yes"' - nsisXML::appendChild - nsisXML::createElement "main" ; create main document element node - nsisXML::appendChild - StrCpy $1 $2 ; lets move to this node and create its childs: - nsisXML::createElementInNS "child" "namespace" - nsisXML::setAttribute "attrib" "value" - nsisXML::setText "content" - nsisXML::appendChild - nsisXML::createElement "child" - nsisXML::setAttribute "attrib" "value2" - nsisXML::setAttribute "active" "yes" - nsisXML::setText "content2" - nsisXML::appendChild - nsisXML::save "Sample.xml" - - MessageBox MB_OK "Sample.xml was created$\nPress OK to continue sample" - - ; In this section, we decided to care about memory leaks, so we use "release" adequately - nsisXML::create - nsisXML::load "Sample.xml" - nsisXML::select '/main/child[@attrib="value2"]' - IntCmp $2 0 notFound - nsisXML::getAttribute "active" - DetailPrint "Attribute 'active' is $3" - nsisXML::getText - DetailPrint "Tag contains $3" - nsisXML::parentNode - nsisXML::removeChild - nsisXML::release $2 - nsisXML::release $1 - nsisXML::save "Sample.xml" - nsisXML::release $0 - Goto end -notFound: - DetailPrint "XPath not resolved" -end: -SectionEnd diff --git a/NSIS Installation/Plugins/extracted/nsisXML/nsisXML.cpp b/NSIS Installation/Plugins/extracted/nsisXML/nsisXML.cpp deleted file mode 100644 index f0a3b84..0000000 --- a/NSIS Installation/Plugins/extracted/nsisXML/nsisXML.cpp +++ /dev/null @@ -1,263 +0,0 @@ -/* -nsisXML -- Small NSIS plugin to manipulate XML data through MSXML -Web site: http://wiz0u.free.fr/prog/nsisXML - -Copyright (c) 2005-2012 Olivier Marcoux - -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source distribution. -*/ - -#define _WINSOCKAPI_ // this is to prevent conflicts on "select" function name -#include -#include -#include -#include - -#import "MSXML.DLL" - -typedef struct { - void *exec_flags; - int (__stdcall *ExecuteCodeSegment)(int, HWND); - void (__stdcall *validate_filename)(TCHAR *); - int (__stdcall *RegisterPluginCallback)(HMODULE, UINT_PTR (*NSISPLUGINCALLBACK)(enum NSPIM)); // returns 0 on success, 1 if already registered and < 0 on errors -} extra_parameters; - -#define NSIS_FUNC(name) \ -extern "C" void __declspec(dllexport) name(HWND hwndParent, int string_size, \ - TCHAR *variables, stack_t **stacktop, extra_parameters *extra) - -typedef struct _stack_t { - struct _stack_t *next; - TCHAR text[1]; // this should be the length of string_size -} stack_t; - -static INT_PTR __stdcall pop_int(stack_t **&stacktop) -{ - stack_t *th; - if (!stacktop || !*stacktop) return 0; - th=(*stacktop); - INT_PTR result = _ttoi(th->text); - *stacktop = th->next; - GlobalFree((HGLOBAL)th); - return result; -} - -static _bstr_t __stdcall pop_bstr(stack_t **&stacktop) -{ - stack_t *th; - if (!stacktop || !*stacktop) return _bstr_t(); - th=(*stacktop); - _bstr_t bstr(th->text); - *stacktop = th->next; - GlobalFree((HGLOBAL)th); - return bstr; -} - -#define pop(name) _bstr_t name = pop_bstr(stacktop); - -#define get(varnum) \ - ((LPDISPATCH) _ttoi(variables+varnum*string_size)) - -void _set(TCHAR *var, LPDISPATCH value) -{ - LPDISPATCH ptr = value; - if (ptr != NULL) ptr->AddRef(); - wsprintf(var, _T("%d"), ptr); -} -#define set(varnum, value) _set(variables + varnum*string_size, value) - -#define settvar(varnum, var) \ - lstrcpy(variables + varnum*string_size, var); -#define var2var(src, dst) \ - lstrcpy(variables + dst*string_size, variables + src*string_size); -#ifdef UNICODE -#define setwvar(varnum, var) settvar(varnum, var) -#else -#define setwvar(varnum, var) \ - WideCharToMultiByte(CP_ACP, 0, var, -1, variables + varnum*string_size, string_size, NULL, NULL); -#endif - -#define get_doc() MSXML::IXMLDOMDocumentPtr doc = get(0) -#define get_parent() MSXML::IXMLDOMNodePtr parent = get(1) -#define set_parent(item) set(1, item) -#define get_child(type) MSXML::type ## Ptr child = get(2) -#define set_child(item) set(2, item) -#define get_child2(type) MSXML::type ## Ptr child2 = get(3) - -const LPCSTR DOMDocuments[] = // DOMDocument UUID from all the available MSXML DLL variants -{ - "{2933bf90-7b36-11d2-b20e-00c04f983e60}", // MSXML::DOMDocument - "{f6d90f11-9c73-11d3-b32e-00c04f990bb4}", // MSXML2::DOMDocument - "{f5078f1b-c551-11d3-89b9-0000f81fe221}", // MSXML2::DOMDocument26 - "{f5078f32-c551-11d3-89b9-0000f81fe221}", // MSXML2::DOMDocument30 - "{88d969c0-f192-11d4-a65f-0040963251e5}", // MSXML2::DOMDocument40 (first to support Axes like following-sibling) - "{88d96a05-f192-11d4-a65f-0040963251e5}", // MSXML2::DOMDocument60 -}; - -HMODULE g_hInstance; -UINT_PTR NSISCallback(enum NSPIM msg) { return 0; } // we get notified of unloading on termination of the installer process - -NSIS_FUNC(create) -{ - if (extra) extra->RegisterPluginCallback(g_hInstance, NSISCallback); // to prevent unloading of this plugin - MSXML::IXMLDOMDocumentPtr doc = NULL; - int index = sizeof(DOMDocuments)/sizeof(DOMDocuments[0]); // try to find the most recent DOMDocument available - while (index--) - { - if (doc.CreateInstance(DOMDocuments[index], NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER) == S_OK) - break; - } - if (doc) doc->async = VARIANT_FALSE; - set(0, doc); - var2var(0, 1); -} - -NSIS_FUNC(load) -{ - get_doc(); - pop(xmlSource); - doc->resolveExternals = VARIANT_FALSE; - doc->validateOnParse = VARIANT_FALSE; - if (doc->load(xmlSource) == 0) - settvar(0, _T("0")); -} - -NSIS_FUNC(loadAndValidate) -{ - get_doc(); - pop(xmlSource); - if (doc->load(xmlSource) == 0) - settvar(0, _T("0")); -} - -NSIS_FUNC(save) -{ - get_doc(); - pop(destination); - doc->save(destination); -} - -NSIS_FUNC(createProcessingInstruction) -{ - get_doc(); - pop(target); - pop(data); - set_child(doc->createProcessingInstruction(target, data)); -} - -NSIS_FUNC(createElement) -{ - get_doc(); - pop(tagName); - set_child(doc->createElement(tagName)); -} - -NSIS_FUNC(createElementInNS) -{ - get_doc(); - pop(tagName); - pop(namespaceURI) - set_child(doc->createNode(long(NODE_ELEMENT), tagName, namespaceURI)); -} - -NSIS_FUNC(setDocumentElement) -{ - get_doc(); - get_child(IXMLDOMElement); - doc->documentElement = child; -} - -NSIS_FUNC(getAttribute) -{ - get_child(IXMLDOMElement); - pop(name); - _variant_t result = child->getAttribute(name); - setwvar(3, (result.vt == VT_NULL) ? L"" : result.bstrVal); -} - -NSIS_FUNC(setAttribute) -{ - get_child(IXMLDOMElement); - pop(name); - pop(value); - child->setAttribute(name, value); -} - -NSIS_FUNC(setText) -{ - get_child(IXMLDOMNode); - pop(text); - child->text = text; -} - -NSIS_FUNC(getText) -{ - get_child(IXMLDOMNode); - setwvar(3, child->text); -} - -NSIS_FUNC(select) -{ - get_doc(); - pop(queryString); - try - { - set(1, doc->selectSingleNode(queryString)); - } - catch (_com_error) - { - settvar(1, _T("0")); - } - var2var(1, 2); -} - -NSIS_FUNC(parentNode) -{ - get_child(IXMLDOMNode); - set_parent(child->parentNode); -} - -NSIS_FUNC(appendChild) -{ - get_parent(); - get_child(IXMLDOMNode); - parent->appendChild(child); -} - -NSIS_FUNC(insertBefore) -{ - get_parent(); - get_child(IXMLDOMNode); - get_child2(IXMLDOMNode); - parent->insertBefore(child, _variant_t(child2, true)); -} - -NSIS_FUNC(removeChild) -{ - get_parent(); - get_child(IXMLDOMNode); - parent->removeChild(child); -} - -NSIS_FUNC(release) -{ - LPUNKNOWN node = LPUNKNOWN(pop_int(stacktop)); - node->Release(); -} - -extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID) -{ - g_hInstance = hInstance; - // we can call CoInitialize here because DLL is not loaded at application - // startup, but dynamically by Installer - CoInitialize(NULL); - return TRUE; -} diff --git a/NSIS Installation/Plugins/extracted/nsisXML/nsisXML.dsp b/NSIS Installation/Plugins/extracted/nsisXML/nsisXML.dsp deleted file mode 100644 index ed12cb0..0000000 --- a/NSIS Installation/Plugins/extracted/nsisXML/nsisXML.dsp +++ /dev/null @@ -1,195 +0,0 @@ -# Microsoft Developer Studio Project File - Name="nsisXML" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=nsisXML - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "nsisXML.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nsisXML.mak" CFG="nsisXML - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nsisXML - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "nsisXML - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "nsisXML - Win32 Release UNICODE" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "nsisXML - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /OPT:REF /OPT:NOWIN98 -# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /out:"../bin/nsisXML.dll" /OPT:REF /OPT:NOWIN98 -# Begin Special Build Tool -IntDir=.\Release -ProjDir=. -TargetDir=..\bin -SOURCE="$(InputPath)" -PostBuild_Desc=Building Sample Installer... -PostBuild_Cmds="%ProgramFiles%\NSIS\Unicode\makensis" /V2 "/DTARGETDIR=$(TargetDir)" "/DINTDIR=$(IntDir)" "$(ProjDir)\Sample.nsi" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "nsisXML - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# Begin Special Build Tool -IntDir=.\Debug -ProjDir=. -TargetDir=.\Debug -SOURCE="$(InputPath)" -PostBuild_Desc=Building Sample Installer... -PostBuild_Cmds="%ProgramFiles%\NSIS\makensis" /V4 "/DTARGETDIR=$(TargetDir)" "/DINTDIR=$(IntDir)" "$(ProjDir)\Sample.nsi" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "nsisXML - Win32 Release UNICODE" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_UNICODE" -# PROP BASE Intermediate_Dir "Release_UNICODE" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_UNICODE" -# PROP Intermediate_Dir "Release_UNICODE" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /OPT:REF /OPT:NOWIN98 -# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /out:"../binU/nsisXML.dll" /OPT:REF /OPT:NOWIN98 -# Begin Special Build Tool -IntDir=.\Release_UNICODE -ProjDir=. -TargetDir=..\binU -SOURCE="$(InputPath)" -PostBuild_Desc=Building Sample Installer... -PostBuild_Cmds="%ProgramFiles%\NSIS\Unicode\makensis" /V2 "/DTARGETDIR=$(TargetDir)" "/DINTDIR=$(IntDir)" "$(ProjDir)\Sample.nsi" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "nsisXML - Win32 Release" -# Name "nsisXML - Win32 Debug" -# Name "nsisXML - Win32 Release UNICODE" -# Begin Source File - -SOURCE=.\License.txt -# End Source File -# Begin Source File - -SOURCE=.\nsisXML.cpp -# End Source File -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# Begin Source File - -SOURCE=.\Sample.nsi - -!IF "$(CFG)" == "nsisXML - Win32 Release" - -# Begin Custom Build -ProjDir=. -InputPath=.\Sample.nsi - -"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - rem Force Post-Build Step - -# End Custom Build - -!ELSEIF "$(CFG)" == "nsisXML - Win32 Debug" - -# Begin Custom Build -ProjDir=. -InputPath=.\Sample.nsi - -"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - rem Force Post-Build Step - -# End Custom Build - -!ELSEIF "$(CFG)" == "nsisXML - Win32 Release UNICODE" - -# Begin Custom Build -ProjDir=. -InputPath=.\Sample.nsi - -"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - rem Force Post-Build Step - -# End Custom Build - -!ENDIF - -# End Source File -# End Target -# End Project diff --git a/NSIS Installation/Plugins/extracted/nsisXML/nsisXML.dsw b/NSIS Installation/Plugins/extracted/nsisXML/nsisXML.dsw deleted file mode 100644 index 9ff349f..0000000 --- a/NSIS Installation/Plugins/extracted/nsisXML/nsisXML.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "nsisXML"=.\nsisXML.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/NSIS Installation/Plugins/extracted/x64-ansi/Aero.dll b/NSIS Installation/Plugins/extracted/x64-ansi/Aero.dll deleted file mode 100644 index 4f79327..0000000 Binary files a/NSIS Installation/Plugins/extracted/x64-ansi/Aero.dll and /dev/null differ diff --git a/NSIS Installation/Plugins/extracted/x64-unicode/Aero.dll b/NSIS Installation/Plugins/extracted/x64-unicode/Aero.dll deleted file mode 100644 index 2977e68..0000000 Binary files a/NSIS Installation/Plugins/extracted/x64-unicode/Aero.dll and /dev/null differ diff --git a/NSIS Installation/Plugins/extracted/x86-ansi/Aero.dll b/NSIS Installation/Plugins/extracted/x86-ansi/Aero.dll deleted file mode 100644 index b1a11cc..0000000 Binary files a/NSIS Installation/Plugins/extracted/x86-ansi/Aero.dll and /dev/null differ diff --git a/NSIS Installation/Plugins/extracted/x86-ansi/LockedList.dll b/NSIS Installation/Plugins/extracted/x86-ansi/LockedList.dll deleted file mode 100644 index 5fab35d..0000000 Binary files a/NSIS Installation/Plugins/extracted/x86-ansi/LockedList.dll and /dev/null differ diff --git a/NSIS Installation/Plugins/extracted/x86-unicode/Aero.dll b/NSIS Installation/Plugins/extracted/x86-unicode/Aero.dll deleted file mode 100644 index 8655851..0000000 Binary files a/NSIS Installation/Plugins/extracted/x86-unicode/Aero.dll and /dev/null differ diff --git a/NSIS Installation/Plugins/extracted/x86-unicode/LockedList.dll b/NSIS Installation/Plugins/extracted/x86-unicode/LockedList.dll deleted file mode 100644 index c1d6738..0000000 Binary files a/NSIS Installation/Plugins/extracted/x86-unicode/LockedList.dll and /dev/null differ diff --git a/NSIS Installation/Plugins/nsisXML.zip b/NSIS Installation/Plugins/nsisXML.zip deleted file mode 100644 index 1023f9a..0000000 Binary files a/NSIS Installation/Plugins/nsisXML.zip and /dev/null differ diff --git a/NSIS Installation/WeekNumber.nsi b/NSIS Installation/WeekNumber.nsi deleted file mode 100644 index 36b7f47..0000000 --- a/NSIS Installation/WeekNumber.nsi +++ /dev/null @@ -1,337 +0,0 @@ -!include "MUI2.nsh" ;Include Modern UI -!include nsDialogs.nsh -!include LogicLib.nsh - -;-------------------------------- -;General -Unicode True - -!ifndef VERSION - !define VERSION "1.0.0.0" -!endif - -;LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" -;LoadLanguageFile "${NSISDIR}\Contrib\Language files\Swedish.nlf" - -!define PRODUCT_NAME "$(ProductNameLanguageSpecific)" -!define PRODUCT_VERSION ${VERSION} -!define PRODUCT_GROUP "WeekNumber" -!define PRODUCT_PUBLISHER "Voltura AB" -!define PRODUCT_WEB_SITE "https://voltura.github.io/WeekNumber" -!define PRODUCT_ID "{550adc75-8afb-4813-ac91-8c8c6cb681ae}" - -;Name and file -Name "WeekNumber" -OutFile "WeekNumber_${VERSION}_Installer.exe" -BrandingText `${PRODUCT_NAME} Installer` -Caption "${PRODUCT_NAME} ${VERSION} Installer" -VIProductVersion ${VERSION} -VIAddVersionKey ProductName "${PRODUCT_NAME} Installer" -VIAddVersionKey Comments "An installer for ${PRODUCT_NAME}" -VIAddVersionKey CompanyName "${PRODUCT_PUBLISHER}" -VIAddVersionKey LegalCopyright "Copyright © ${PRODUCT_PUBLISHER} 2018-2022" -VIAddVersionKey FileDescription "${PRODUCT_NAME} Installer" -VIAddVersionKey FileVersion ${VERSION} -VIAddVersionKey ProductVersion ${VERSION} -VIAddVersionKey InternalName "${PRODUCT_NAME} Installer" -VIAddVersionKey OriginalFilename "WeekNumber_${VERSION}_Installer.exe" -VIAddVersionKey PrivateBuild "${VERSION}" -VIAddVersionKey SpecialBuild "${VERSION}" -;Default installation folder -InstallDir "$LOCALAPPDATA\Voltura AB\WeekNumber" -;Get installation folder from registry if available -InstallDirRegKey HKCU "Software\WeekNumber" "" -;Request application privileges for Windows -RequestExecutionLevel user - -;-------------------------------- -;Variables -Var StartMenuFolder -Var KillResult - -;-------------------------------- -;Macros -!macro AdjustConfigValue ConfigFile Key Value - DetailPrint "Config: adding '${Key}'='${Value}' to ${ConfigFile}" - nsisXML::create - nsisXML::load ${ConfigFile} - nsisXML::select "/configuration/appSettings/add[@key='${Key}']" - nsisXML::setAttribute "value" ${Value} - nsisXML::save ${ConfigFile} -!macroend - - -;-------------------------------- -;Interface Settings -;Show all languages, despite user's codepage -!define MUI_LANGDLL_ALLLANGUAGES -!define MUI_ABORTWARNING -!define MUI_ICON "..\Resources\weekicon.ico" -!define MUI_UNICON "..\Resources\weekicon.ico" -!define MUI_HEADERIMAGE_BITMAP "..\Resources\WeekNumber.bmp" -!define MUI_HEADERIMAGE_BITMAP_STRETCH AspectFitHeight -!define MUI_HEADERIMAGE_UNBITMAP "..\Resources\WeekNumber.bmp" -!define MUI_HEADERIMAGE_UNBITMAP_STRETCH AspectFitHeight -!define MUI_CUSTOMFUNCTION_GUIINIT onGUIInit - -;-------------------------------- -;Language Selection Dialog Settings -;Remember the installer language -!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" -!define MUI_LANGDLL_REGISTRY_KEY "Software\WeekNumber" -!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" - -;-------------------------------- -;Pages -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "$(LICENSETXT)" -!insertmacro MUI_PAGE_DIRECTORY -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\WeekNumber" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" -!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder -!insertmacro MUI_PAGE_INSTFILES -!define MUI_FINISHPAGE_RUN "$INSTDIR\WeekNumber.exe" -!define MUI_FINISHPAGE_RUN_TEXT "$(RUNWEEKNUMBER)" -!define MUI_FINISHPAGE_SHOWREADME "" -!define MUI_FINISHPAGE_SHOWREADME_TEXT "$(StartWithWindows)" -!define MUI_FINISHPAGE_SHOWREADME_FUNCTION configureStartWithWindows -!insertmacro MUI_PAGE_FINISH -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -;-------------------------------- -;Languages -!insertmacro MUI_LANGUAGE "English" ; The first language is the default language -!insertmacro MUI_LANGUAGE "Swedish" - -;Language strings -LicenseLangString LICENSETXT ${LANG_ENGLISH} "License.en-US.txt" - -LicenseLangString LICENSETXT ${LANG_SWEDISH} "License.sv-SE.txt" - -LangString RUNWEEKNUMBER ${LANG_ENGLISH} "Run WeekNumber" - -LangString RUNWEEKNUMBER ${LANG_SWEDISH} "Kör WeekNumber" - -LangString WeekNumberIsRunning ${LANG_ENGLISH} "WeekNumber is running, close it and run installer again." - -LangString WeekNumberIsRunning ${LANG_SWEDISH} "WeekNumber startad, avsluta programmet installera igen." - -LangString unWeekNumberIsRunning ${LANG_ENGLISH} "WeekNumber is running, close it and run uninstaller again." - -LangString unWeekNumberIsRunning ${LANG_SWEDISH} "WeekNumber startad, avsluta programmet och avinstallera igen." - -LangString ProductNameLanguageSpecific ${LANG_ENGLISH} "WeekNumber by Voltura AB" - -LangString ProductNameLanguageSpecific ${LANG_SWEDISH} "WeekNumber av Voltura AB" - -LangString StartWithWindows ${LANG_ENGLISH} "Start WeekNumber with Windows" - -LangString StartWithWindows ${LANG_SWEDISH} "Starta WeekNumber med Windows" - -LangString CheckIfWeekNumberIsRunning ${LANG_ENGLISH} "Checking if WeekNumber is running..." - -LangString CheckIfWeekNumberIsRunning ${LANG_SWEDISH} "Kontrollerar om WeekNumber körs..." - -LangString ConfigStartWithWindows ${LANG_ENGLISH} "Configuring WeekNumber to start with Windows..." - -LangString ConfigStartWithWindows ${LANG_SWEDISH} "Konfigurerar WeekNumber att starta med Windows..." - -LangString WeekNumberRunningTryStop ${LANG_ENGLISH} "WeekNumber is running, trying to stop it..." - -LangString WeekNumberRunningTryStop ${LANG_SWEDISH} "WeekNumber körs, försöker stoppa..." - -LangString WeekNumberRunningAbortInstall ${LANG_ENGLISH} "Installation aborted - WeekNumber is running" - -LangString WeekNumberRunningAbortInstall ${LANG_SWEDISH} "Installation avbruten - WeekNumber körs" - -LangString WeekNumberRunningAbortUninstall ${LANG_ENGLISH} "Uninstall aborted - WeekNumber is running" - -LangString WeekNumberRunningAbortUninstall ${LANG_SWEDISH} "Avinstallation avbruten - WeekNumber körs" - -LangString WeekNumberRunningCloseBeforeInstall ${LANG_ENGLISH} "WeekNumber is running. Please close before install." - -LangString WeekNumberRunningCloseBeforeInstall ${LANG_SWEDISH} "WeekNumber körs. Vänligen stäng innan installation." - -LangString WeekNumberRunningCloseBeforeUninstall ${LANG_ENGLISH} "WeekNumber is running. Please close before uninstall." - -LangString WeekNumberRunningCloseBeforeUninstall ${LANG_SWEDISH} "WeekNumber körs. Vänligen stäng innan avinstallation." - -LangString WeekNumberNotRunning ${LANG_ENGLISH} "WeekNumber is not running" - -LangString WeekNumberNotRunning ${LANG_SWEDISH} "WeekNumber körs ej" - -;-------------------------------- -;Reserve Files - !insertmacro MUI_RESERVEFILE_LANGDLL - -;-------------------------------- -;Installer Sections -Section "WeekNumber application" SecWeekNumber - Call weekNumberExeRunning - ${If} $KillResult == "NOK" - IfSilent +2 - Messagebox MB_OK|MB_ICONSTOP "$(WeekNumberIsRunning)" - Abort - ${EndIf} - ;Uninstall old version - ExecWait '"$INSTDIR\Uninstall WeekNumber.exe" /S _?=$INSTDIR' - SetOutPath "$INSTDIR" - File "..\bin\x86\Release\WeekNumber.exe" - File "..\bin\x86\Release\WeekNumber.exe" - SetOutPath "$INSTDIR\\sv-SE" - SetOverwrite try - File "..\bin\x86\Release\sv-SE\WeekNumber.resources.dll" - SetOutPath "$INSTDIR\\en-US" - File "..\bin\x86\Release\en-US\WeekNumber.resources.dll" - ;Store installation folder - WriteRegStr HKCU "Software\WeekNumber" "" $INSTDIR - ;Create uninstaller - WriteUninstaller "$INSTDIR\Uninstall WeekNumber.exe" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "DisplayName" "WeekNumber by Voltura AB" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "UninstallString" "$\"$INSTDIR\Uninstall WeekNumber.exe$\"" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "QuietUninstallString" "$\"$INSTDIR\Uninstall WeekNumber.exe$\" /S" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "InstallLocation" "$\"$INSTDIR$\"" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "Publisher" "Voltura AB" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "Readme" "https://voltura.github.io/WeekNumber" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "URLUpdateInfo" "https://github.com/voltura/weeknumber/releases/latest/download/VERSION.TXT" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "URLInfoAbout" "https://voltura.github.io/WeekNumber" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "HelpLink" "https://voltura.github.io/WeekNumber" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "DisplayVersion" "${VERSION}" - WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "NoModify" "1" - WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "NoRepair" "1" - WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "EstimatedSize" "512" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "Comments" "System tray app - shows current week number" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" "DisplayIcon" "$\"$INSTDIR\WeekNumber.exe$\"" - - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - ;Create shortcuts - CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortcut "$SMPROGRAMS\$StartMenuFolder\WeekNumber.lnk" "$INSTDIR\WeekNumber.exe" - CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Uninstall WeekNumber.lnk" "$INSTDIR\Uninstall WeekNumber.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -;-------------------------------- -;Uninstaller Section -Section "Uninstall" - Call un.weekNumberExeRunning - ${If} $KillResult == "NOK" - IfSilent +2 - Messagebox MB_OK|MB_ICONSTOP "$(UnWeekNumberIsRunning)" - Abort - ${EndIf} - Delete "$INSTDIR\WeekNumber.exe" - Delete "$INSTDIR\sv-SE\WeekNumber.resources.dll" - Delete "$INSTDIR\en-US\WeekNumber.resources.dll" - - ;do not delete old application log files if silently uninstalling, - ;normal scenario for silent uninstall is auto-update - IfSilent +2 - Delete "$INSTDIR\WeekNumber.exe.log" - - Delete "$INSTDIR\WeekNumber.exe.Config" - Delete "$INSTDIR\Uninstall WeekNumber.exe" - - ;do not delete old application log files if silently uninstalling, - ;normal scenario for silent uninstall is auto-update - IfSilent +5 - Delete "$LOCALAPPDATA\WeekNumber.exe.log" - Delete "$LOCALAPPDATA\WeekNumber\WeekNumber.exe.log" - Delete "$LOCALAPPDATA\Voltura AB\WeekNumber.exe.log" - Delete "$LOCALAPPDATA\Voltura AB\WeekNumber\WeekNumber.exe.log" - - Delete "$LOCALAPPDATA\Temp\WeekNumberCleanup.exe" - Delete "$LOCALAPPDATA\Temp\WeekNumber_*_Installer.exe" - Delete "$LOCALAPPDATA\Temp\WeekNumber_*_Installer.exe.MD5" - - ;do not remove install folder if silent uninstall (normally happens during auto-update), - ;we want to keep log file - IfSilent +2 - RMDir "$INSTDIR" - - RMDir "$INSTDIR\sv-SE" - RMDir "$INSTDIR\en-US" - !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder - Delete "$SMPROGRAMS\$StartMenuFolder\WeekNumber.lnk" - Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall WeekNumber.lnk" - RMDir "$SMPROGRAMS\$StartMenuFolder" - - ;do not remove local appdata folder if silent uninstall (normally happens during auto-update), - ;we want to keep log file - IfSilent +2 - RMDir "$LOCALAPPDATA\WeekNumber" - - DeleteRegKey HKCU "Software\WeekNumber" - IfSilent +3 - DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Run\WeekNumber" - DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\WeekNumber" - -SectionEnd - -;-------------------------------- -; Functions -Function configureStartWithWindows - ;Add Start with Windows setting - DetailPrint "$(ConfigStartWithWindows)" - !insertmacro AdjustConfigValue "$INSTDIR\WeekNumber.exe.config" "StartWithWindows" "True" -FunctionEnd - -Function onGUIInit - Aero::Apply -FunctionEnd - -Function weekNumberExeRunning - StrCpy $R0 2 - DetailPrint "$(CheckIfWeekNumberIsRunning)" - System::Call 'kernel32::OpenMutex(i 0x100000, b 0, t "550adc75-8afb-4813-ac91-8c8c6cb681ae") i .R0' - IntCmp $R0 0 notRunning - System::Call 'kernel32::CloseHandle(i $R0)' - DetailPrint "$(WeekNumberRunningTryStop)" - LockedList::CloseProcess /kill WeekNumber.exe - Sleep 2000 - System::Call 'kernel32::OpenMutex(i 0x100000, b 0, t "550adc75-8afb-4813-ac91-8c8c6cb681ae") i .R0' - IntCmp $R0 0 notRunning - DetailPrint "$(WeekNumberRunningAbortInstall)" - IfSilent +2 - MessageBox MB_OK|MB_ICONEXCLAMATION "$(WeekNumberRunningCloseBeforeInstall)" /SD IDOK - StrCpy $KillResult "NOK" - Abort - notRunning: - StrCpy $KillResult "OK" - DetailPrint "$(WeekNumberNotRunning)" -FunctionEnd - -Function un.weekNumberExeRunning - StrCpy $R0 2 - DetailPrint "$(CheckIfWeekNumberIsRunning)" - System::Call 'kernel32::OpenMutex(i 0x100000, b 0, t "550adc75-8afb-4813-ac91-8c8c6cb681ae") i .R0' - IntCmp $R0 0 notRunning - System::Call 'kernel32::CloseHandle(i $R0)' - DetailPrint "$(WeekNumberRunningTryStop)" - LockedList::CloseProcess /kill WeekNumber.exe - Sleep 2000 - System::Call 'kernel32::OpenMutex(i 0x100000, b 0, t "550adc75-8afb-4813-ac91-8c8c6cb681ae") i .R0' - IntCmp $R0 0 notRunning - DetailPrint "$(WeekNumberRunningAbortUninstall)" - IfSilent +2 - MessageBox MB_OK|MB_ICONEXCLAMATION "$(WeekNumberRunningCloseBeforeUninstall)" /SD IDOK - StrCpy $KillResult "NOK" - Abort - notRunning: - StrCpy $KillResult "OK" - DetailPrint "$(WeekNumberNotRunning)" -FunctionEnd - -Function .onInstSuccess - IfSilent 0 +2 - Exec '"$INSTDIR\WeekNumber.exe"' - -FunctionEnd - -;Function .onInit -; !insertmacro MUI_LANGDLL_DISPLAY -;FunctionEnd \ No newline at end of file diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 7d9720e..fc75e79 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -18,8 +18,8 @@ [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("550adc75-8afb-4813-ac91-8c8c6cb681ae")] -[assembly: AssemblyVersion("1.6.6.*")] -[assembly: AssemblyFileVersion("1.6.6.2")] +[assembly: AssemblyVersion("1.6.6.4")] +[assembly: AssemblyFileVersion("1.6.6.4")] [assembly: NeutralResourcesLanguage("en-US")] #endregion Assembly information \ No newline at end of file diff --git a/README.md b/README.md index a91ac96..6bdacc9 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Windows 11/10 system tray area application that displays the current week number WeekNumber ![image](https://user-images.githubusercontent.com/2292809/120940539-0f071200-c71e-11eb-8b03-8f24b9fb36ad.png) -[![Latest release ZIP](https://img.shields.io/github/v/release/voltura/WeekNumber?label=download%20latest%20release&style=for-the-badge)](https://github.com/voltura/weeknumber/releases/latest/download/WeekNumber.zip) +[![Latest release ZIP](https://img.shields.io/github/v/release/voltura/WeekNumber?label=download%20latest%20release&style=for-the-badge)](https://github.com/voltura/weeknumber/releases/latest/download/WeekNumber_v1.6.6.3.zip) [![Github All Releases](https://img.shields.io/github/downloads/voltura/WeekNumber/total.svg)]() [![License](https://img.shields.io/badge/licence-MIT-green)]() @@ -14,7 +14,7 @@ Windows 11/10 system tray area application that displays the current week number ## Features Always see the current week number in the system tray area in Windows taskbar and lookup the week number for any other date via double-click on the application icon. -Options to start with Windows, customize icon colors, language, notifications, automatic updates, calendar rules and more. For details see _**Help section**_ below. +Options to start with Windows, customize icon colors, language, notifications, calendar rules and more. For details see _**Help section**_ below. ### Supported Languages - English @@ -40,39 +40,23 @@ Options to start with Windows, customize icon colors, language, notifications, a ![Settings Language](https://user-images.githubusercontent.com/2292809/121083488-c9ab1900-c7df-11eb-9a09-6dac98153ba2.png) ## Installation -Download installer and run to install with option to start the application when the installer finishes. -If you downloaded WeekNumber.zip via [*Download latest release*](https://github.com/voltura/weeknumber/releases/latest/download/WeekNumber.zip) first unzip the archive, then run the installer. -To remove the application run the uninstaller or use Windows *Add or remove programs* feature or via the Control Panels *Programs And Features* section. +After download of WeekNumber_v1.6.6.3.zip via [*Download latest release*](https://github.com/voltura/weeknumber/releases/latest/download/WeekNumber_v1.6.6.3.zip) first unzip the archive, then run WeekNumber.exe. +To remove the application just delete the executable and other files extracted from the zip archive and the generated application configuration file WeekNumber.exe.config. -### Installation notes +### Download notes Choose to keep the file downloaded if prompted - it will look similar to this (depends on your web browser and settings) ![Keep file if prompted #1](https://user-images.githubusercontent.com/2292809/120716901-fa7d0c80-c4c6-11eb-9232-f279f959f0a6.png) -![Keep file if prompted #2](https://user-images.githubusercontent.com/2292809/118524536-8c9eba00-b73e-11eb-9c6c-bc8defde0caa.png) - -Use below actions to allow the installer to run on your PC when Microsoft SmartScreen is active: - -![smartscreen_0](https://user-images.githubusercontent.com/2292809/120404034-c201f500-c345-11eb-9abd-670e927c4a36.png) - -![smartscreen_1](https://user-images.githubusercontent.com/2292809/120404043-c4fce580-c345-11eb-945d-a5931bb5b721.png) ### Security notes / alternative lightweight version -Microsoft Defender / Windows Security identifies installer and application as a trojan and/or malware which is *not* the case. -There is a way to still allow the full version of WeekNumber to run without warnings, but for users that are not comfortable and/or skilled to do configure this there is another option. -I have created a lightweight version that does not trigger any false alarm, but this version only can display the current week number in the task area, nothing else. -Not autostart with Windows (it can manually be made to start with Windows - google how), it has no installer, it does not auto-update. +Microsoft Defender / Windows Security could identify application as a virus, trojan and/or malware which is *not* the case. +I have created a lightweight version that does not trigger any false alarm, this version only can display the current week number in the task area, nothing else. +Not autostart with Windows (it can manually be made to start with Windows - google how). Nor do the lightweight version have options to change icon colors or anything else that the full version of WeekNumber can do. See more [here](https://voltura.github.io/WeekNumberLite2/) if interested. -#### Distributed / Silent install / uninstall options -To silently install call the installer with /S parameter. -> WeekNumber_{VERSION}_Installer.exe /S - -To silently uninstall call the uninstaller with /S parameter. -> Uninstall WeekNumber.exe /S - ## Help section All application features are accessible via right-click on the application icon residing in the system tray area in Windows taskbar. If the application icon is not visible then press the ^ symbol on the system tray area, click and hold on the application icon and then drag it to the visible system tray area to pin it there. diff --git a/README.sv-SE.md b/README.sv-SE.md index bef88b2..fb4ae36 100644 --- a/README.sv-SE.md +++ b/README.sv-SE.md @@ -5,7 +5,7 @@ Windows 11/10 systemfĂ€ltsapplikation som visar aktuellt veckonummer WeekNumber ![image](https://user-images.githubusercontent.com/2292809/121431601-e8451780-c979-11eb-9734-f30304c348d1.png) -[![Latest release ZIP](https://img.shields.io/github/v/release/voltura/WeekNumber?label=ladda%20ner%20senaste%20versionen&style=for-the-badge)](https://github.com/voltura/weeknumber/releases/latest/download/WeekNumber.zip) +[![Latest release ZIP](https://img.shields.io/github/v/release/voltura/WeekNumber?label=ladda%20ner%20senaste%20versionen&style=for-the-badge)](https://github.com/voltura/weeknumber/releases/latest/download/WeekNumber_v1.6.6.3.zip) [![Github All Releases](https://img.shields.io/github/downloads/voltura/WeekNumber/total.svg)]() [![License](https://img.shields.io/badge/licence-MIT-green)]() @@ -45,64 +45,14 @@ StĂ€ll in att starta med Windows, anpassa ikonfĂ€rger, sprĂ„k, notiser, automati ![Mera instĂ€llningar](https://user-images.githubusercontent.com/2292809/121432695-49b9b600-c97b-11eb-8576-89b792cd2514.png) ## Installation -Ladda ner installationsprogrammet och kör det för att installera, applikationen startas efter installation. -Om du laddat ned WeekNumber.zip via *LADDA NER SENASTE VERSIONEN* packa först upp arkivet och kör sedan installationsprogrammet. -För att ta bort applikationen sĂ„ kör avinstallationsprogrammet eller anvĂ€nd dig av Windows *LĂ€gg till/ta bort program*-funktion. Det gĂ„r ocksĂ„ att avinstallera via Windows kontrollpanel under sektionen *Program och funktioner*. +Ladda ner zip, extrahera och kör WeekNumber.exe. -### Installationsnotiser -Notis: Beroende pĂ„ webblĂ€sare och instĂ€llningar sĂ„ kan nedladdningsförfarandet skilja sig, om webblĂ€saren blockerade nedladdningen sĂ„ gĂ„r det att tvinga den att spara den nedladdade filen, se den Engelska versionen av denna text för mer detaljer (vĂ€lj _English_ högst upp i denna sida). - -![image](https://user-images.githubusercontent.com/2292809/121436155-5987c900-c980-11eb-887b-6fd36eac060a.png) - -Tryck _Öppna fil..._ - -![image](https://user-images.githubusercontent.com/2292809/121436254-83d98680-c980-11eb-8296-21f3fa62399f.png) - -Markera installationsprogrammet och vĂ€lj _Kör_ - -![image](https://user-images.githubusercontent.com/2292809/121436322-a8cdf980-c980-11eb-9519-9c622c0a863d.png) - -Tryck _Mer information_ - -![image](https://user-images.githubusercontent.com/2292809/121436394-c8fdb880-c980-11eb-9cbc-a11a9f101555.png) - -Tryck _Kör Ă€ndĂ„_ - -![image](https://user-images.githubusercontent.com/2292809/121436506-ffd3ce80-c980-11eb-8367-de2f173b4ea9.png) - -Tryck _NĂ€sta_ - -![image](https://user-images.githubusercontent.com/2292809/121436555-10844480-c981-11eb-9a8b-9b572cd25a83.png) - -LĂ€s igenom och godkĂ€nn licensavtalet genom att trycka pĂ„ _Jag GodkĂ€nner_ - -![image](https://user-images.githubusercontent.com/2292809/121436647-43c6d380-c981-11eb-9b23-d2e9552d5783.png) - -VĂ€lj vart applikationen ska installeras och tryck _NĂ€sta_ - -![image](https://user-images.githubusercontent.com/2292809/121436672-504b2c00-c981-11eb-8e81-9fa2f5ad4f8b.png) - -VĂ€lj om startmeny-genvĂ€gar ska skapas för applikationen och tryck sedan _Installera_ - -![image](https://user-images.githubusercontent.com/2292809/121436739-6d7ffa80-c981-11eb-93c8-6fba598817cc.png) - -VĂ€lj om WeekNumber ska startas med Windows och om applikationen ska startas dĂ„ installationen Ă€r klar, tryck sedan _Slutför_ - -![image](https://user-images.githubusercontent.com/2292809/121436875-a15b2000-c981-11eb-9ebb-db089999b830.png) - En notis visas dĂ„ WeekNumber Ă€r startad ![image](https://user-images.githubusercontent.com/2292809/121437224-3a8a3680-c982-11eb-898c-84d45d33611f.png) Aktuellt veckonummer visas nu bland systemfĂ€ltets ikoner, ser du inte veckonummer tryck pĂ„ taktecknet (^) i systemfĂ€ltet och klicka-hĂ„ll och dra ned ikonen sĂ„ den blir synlig. - -#### Distribuerad/tyst installation/avinstallation -För att installera utan frĂ„gor ange /S som parameter till installationsprogrammet. -> WeekNumber_{VERSION}_Installer.exe /S - -För att avinstallera utan frĂ„gor/grĂ€nssnitt anropa avinstallationsprogrammet med parameter /S. -> Uninstall WeekNumber.exe /S ## HjĂ€lpavsnitt Alla funktioner Ă€r tillgĂ€ngliga genom att höger-klicka pĂ„ applikationens ikon i Windows systemfĂ€lt. diff --git a/WeekNumber.csproj b/WeekNumber.csproj index d065a52..1478282 100644 --- a/WeekNumber.csproj +++ b/WeekNumber.csproj @@ -158,22 +158,23 @@ - + + Designer Designer - + - - + + diff --git a/WeekNumberMonitor/WeekNumberMonitor.csproj b/WeekNumberMonitor/WeekNumberMonitor.csproj index 4ca3327..77fed27 100644 --- a/WeekNumberMonitor/WeekNumberMonitor.csproj +++ b/WeekNumberMonitor/WeekNumberMonitor.csproj @@ -77,6 +77,9 @@ true + + + diff --git a/WeekNumberMonitor/app.config b/WeekNumberMonitor/app.config new file mode 100644 index 0000000..3e0e37c --- /dev/null +++ b/WeekNumberMonitor/app.config @@ -0,0 +1,3 @@ + + +