diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..64ef79a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "lib/WinStd"] + path = lib/WinStd + url = https://github.com/Amebis/WinStd.git +[submodule "lib/MSICALib"] + path = lib/MSICALib + url = https://github.com/Amebis/MSICALib.git diff --git a/MSICA.sln b/MSICA.sln index 643a983..cd32fe0 100644 --- a/MSICA.sln +++ b/MSICA.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "..\..\lib\MSICALib\build\MSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "lib\MSICALib\build\MSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICA", "build\MSICA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICA", "MSICA\MSICA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{26350A68-2F55-4732-972C-4A5E9077699E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "..\..\lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/MSIBuild/.gitignore b/MSICA/MSIBuild/.gitignore similarity index 100% rename from MSIBuild/.gitignore rename to MSICA/MSIBuild/.gitignore diff --git a/MSIBuild/Makefile b/MSICA/MSIBuild/Makefile similarity index 96% rename from MSIBuild/Makefile rename to MSICA/MSIBuild/Makefile index c888424..9be0449 100644 --- a/MSIBuild/Makefile +++ b/MSICA/MSIBuild/Makefile @@ -17,7 +17,7 @@ # along with MSICA. If not, see . # -!INCLUDE "..\..\..\include\MSIBuildCfg.mak" +!INCLUDE "..\..\..\..\include\MSIBuildCfg.mak" MSIBUILD_IS_LOCALIZEABLE=1 @@ -27,7 +27,7 @@ MSIBUILD_IS_LOCALIZEABLE=1 All :: "$(LANG).$(PLAT).$(CFG)._Validation-1.idt" -"$(LANG).$(PLAT).$(CFG)._Validation-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG)._Validation-1.idt" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Table Column Nullable MinValue MaxValue KeyTable KeyColumn Category Set Description @@ -91,7 +91,7 @@ WLANProfile Component_ N Component 1 Identifier Component the profile is part All :: "$(LANG).$(PLAT).$(CFG).ActionText-2.idt" -"en_US.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"en_US.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Description Template @@ -113,7 +113,7 @@ InstallScheduledTasksExec Installing scheduled tasks Scheduled task: [1] copy /y $** $@ > NUL !ELSE "$(LANG).$(PLAT).$(CFG).ActionText-2.idt" : "en_US.$(PLAT).$(CFG).ActionText-2.idtx" "..\locale\$(LANG).po" - cscript.exe "..\..\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE) + cscript.exe "..\..\..\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE) !ENDIF @@ -124,7 +124,7 @@ All :: \ "$(LANG).$(PLAT).$(CFG).Binary-1.idt" \ "$(LANG).$(PLAT).$(CFG).Binary-1\MSICA.dll" -"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1" +"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1" -if exist $@ del /f /q $@ move /y << $@ > NUL Name Data @@ -133,7 +133,7 @@ Binary Name binMSICA.dll MSICA.dll < NUL @@ -142,7 +142,7 @@ binMSICA.dll MSICA.dll # #All :: "$(LANG).$(PLAT).$(CFG).Certificate-1.idt" # -#"$(LANG).$(PLAT).$(CFG).Certificate-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +#"$(LANG).$(PLAT).$(CFG).Certificate-1.idt" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak" # -if exist $@ del /f /q $@ # move /y << $@ > NUL #Certificate Store Flags Encoding Binary_ Condition Component_ @@ -156,7 +156,7 @@ binMSICA.dll MSICA.dll All :: "$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" -"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Type Source Target @@ -198,7 +198,7 @@ InstallScheduledTasksCommit 3585 binMSICA.dll ExecuteSequence All :: "$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" -"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence @@ -240,7 +240,7 @@ InstallScheduledTasksCommit 6164 # #All :: "$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" # -#"$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +#"$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak" # -if exist $@ del /f /q $@ # move /y << $@ > NUL #Task DisplayName Application Parameters Directory_ Flags Priority User Password Author Description IdleMin IdleDeadline MaxRuntime Condition Component_ @@ -254,7 +254,7 @@ InstallScheduledTasksCommit 6164 # #All :: "$(LANG).$(PLAT).$(CFG).ServiceConfigure-1.idt" # -#"$(LANG).$(PLAT).$(CFG).ServiceConfigure-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +#"$(LANG).$(PLAT).$(CFG).ServiceConfigure-1.idt" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak" # -if exist $@ del /f /q $@ # move /y << $@ > NUL #ServiceConfigure Name StartType Control Condition Sequence @@ -268,7 +268,7 @@ InstallScheduledTasksCommit 6164 # #All :: "$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" # -#"$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +#"$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak" # -if exist $@ del /f /q $@ # move /y << $@ > NUL #Trigger BeginDate EndDate StartTime StartTimeRand MinutesDuration MinutesInterval Flags Type DaysInterval WeeksInterval DaysOfTheWeek DaysOfMonth WeekOfMonth MonthsOfYear Task_ @@ -282,7 +282,7 @@ InstallScheduledTasksCommit 6164 # #All :: "$(LANG).$(PLAT).$(CFG).WLANProfile-1.idt" # -#"$(LANG).$(PLAT).$(CFG).WLANProfile-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +#"$(LANG).$(PLAT).$(CFG).WLANProfile-1.idt" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak" # -if exist $@ del /f /q $@ # move /y << $@ > NUL #WLANProfile Name Binary_ Condition Component_ @@ -295,4 +295,4 @@ InstallScheduledTasksCommit 6164 # Build MSM module! ###################################################################### -!INCLUDE "..\..\MSIBuild\MSM.mak" +!INCLUDE "..\..\..\MSIBuild\MSM.mak" diff --git a/MSIBuild/build_all.bat b/MSICA/MSIBuild/build_all.bat similarity index 100% rename from MSIBuild/build_all.bat rename to MSICA/MSIBuild/build_all.bat diff --git a/MSIBuild/clean_all.bat b/MSICA/MSIBuild/clean_all.bat similarity index 100% rename from MSIBuild/clean_all.bat rename to MSICA/MSIBuild/clean_all.bat diff --git a/src/MSICA.cpp b/MSICA/MSICA.cpp similarity index 100% rename from src/MSICA.cpp rename to MSICA/MSICA.cpp diff --git a/include/MSICA.h b/MSICA/MSICA.h similarity index 100% rename from include/MSICA.h rename to MSICA/MSICA.h diff --git a/build/MSICA.props b/MSICA/MSICA.props similarity index 81% rename from build/MSICA.props rename to MSICA/MSICA.props index 894f4c6..f398825 100644 --- a/build/MSICA.props +++ b/MSICA/MSICA.props @@ -39,11 +39,8 @@ Windows - ..\include;..\..\..\lib\MSICALib\include;..\..\..\lib\WinStd\include;%(AdditionalIncludeDirectories) + ..\lib\MSICALib\include;..\lib\WinStd\include;%(AdditionalIncludeDirectories) - - ..\include;%(AdditionalIncludeDirectories) - \ No newline at end of file diff --git a/build/MSICA.vcxproj b/MSICA/MSICA.vcxproj similarity index 84% rename from build/MSICA.vcxproj rename to MSICA/MSICA.vcxproj index e203e0e..c46d982 100644 --- a/build/MSICA.vcxproj +++ b/MSICA/MSICA.vcxproj @@ -45,26 +45,26 @@ - - + + - - + + - - + + - - + + @@ -76,8 +76,8 @@ - - + + Create Create Create @@ -85,17 +85,17 @@ - - + + - + - + {8552ee55-177e-4f51-b51b-baf7d6462cde} - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/build/MSICA.vcxproj.filters b/MSICA/MSICA.vcxproj.filters similarity index 81% rename from build/MSICA.vcxproj.filters rename to MSICA/MSICA.vcxproj.filters index d0e98c7..475fbe7 100644 --- a/build/MSICA.vcxproj.filters +++ b/MSICA/MSICA.vcxproj.filters @@ -15,23 +15,23 @@ - + Source Files - + Source Files - + Header Files - + Header Files - + Resource Files diff --git a/locale/.gitignore b/MSICA/locale/.gitignore similarity index 100% rename from locale/.gitignore rename to MSICA/locale/.gitignore diff --git a/locale/MSICA.pot b/MSICA/locale/MSICA.pot similarity index 98% rename from locale/MSICA.pot rename to MSICA/locale/MSICA.pot index a796611..771c067 100644 --- a/locale/MSICA.pot +++ b/MSICA/locale/MSICA.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: MSICA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-05 08:41+0200\n" +"POT-Creation-Date: 2017-04-24 22:48+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -14,7 +14,7 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: __\n" "X-Poedit-Basepath: ..\n" -"X-Generator: Poedit 1.8.9\n" +"X-Generator: Poedit 2.0.1\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Poedit-SearchPath-0: MSIBuild\n" diff --git a/locale/de_DE.po b/MSICA/locale/de_DE.po similarity index 100% rename from locale/de_DE.po rename to MSICA/locale/de_DE.po diff --git a/locale/ru_RU.po b/MSICA/locale/ru_RU.po similarity index 100% rename from locale/ru_RU.po rename to MSICA/locale/ru_RU.po diff --git a/locale/sl_SI.po b/MSICA/locale/sl_SI.po similarity index 100% rename from locale/sl_SI.po rename to MSICA/locale/sl_SI.po diff --git a/res/MSICA.rc b/MSICA/res/MSICA.rc similarity index 99% rename from res/MSICA.rc rename to MSICA/res/MSICA.rc index ece5012..6cc84c8 100644 Binary files a/res/MSICA.rc and b/MSICA/res/MSICA.rc differ diff --git a/src/stdafx.cpp b/MSICA/stdafx.cpp similarity index 100% rename from src/stdafx.cpp rename to MSICA/stdafx.cpp diff --git a/src/stdafx.h b/MSICA/stdafx.h similarity index 98% rename from src/stdafx.h rename to MSICA/stdafx.h index 57c336f..7aef926 100644 --- a/src/stdafx.h +++ b/MSICA/stdafx.h @@ -39,4 +39,4 @@ extern DWORD (WINAPI *pfnWlanEnumInterfaces)(__in HANDLE hClientHandle, __reserv #include -#include +#include "MSICA.h" diff --git a/include/Debug.props b/include/Debug.props new file mode 100644 index 0000000..5e8025d --- /dev/null +++ b/include/Debug.props @@ -0,0 +1,53 @@ + + + + + + + <_PropertySheetDisplayName>MSICA Debug + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebug + EnableFastChecks + true + + + _DEBUG;%(PreprocessorDefinitions) + + + false + + + + + + + + + + + \ No newline at end of file diff --git a/include/Release.props b/include/Release.props new file mode 100644 index 0000000..978912a --- /dev/null +++ b/include/Release.props @@ -0,0 +1,53 @@ + + + + + + + <_PropertySheetDisplayName>MSICA Release + + + + Full + AnySuitable + true + Speed + true + true + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded + + + NDEBUG;%(PreprocessorDefinitions) + + + + + + + + + + + \ No newline at end of file diff --git a/include/Win32.props b/include/Win32.props new file mode 100644 index 0000000..84d9f7b --- /dev/null +++ b/include/Win32.props @@ -0,0 +1,39 @@ + + + + + + + + + <_PropertySheetDisplayName>MSICA Win32 + $(WXWIN)\lib\vc$(PlatformToolsetVersion)_dll;$(LibraryPath) + + + + MachineX86 + + + Windows + MachineX86 + + + + \ No newline at end of file diff --git a/include/common.props b/include/common.props new file mode 100644 index 0000000..d815921 --- /dev/null +++ b/include/common.props @@ -0,0 +1,58 @@ + + + + + + + + MSICA + + + <_PropertySheetDisplayName>MSICA Common + temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\ + temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\ + $(WXWIN)\include\msvc;$(WXWIN)\include;$(IncludePath) + $(WXWIN)\src\aui;$(WXWIN)\src\cocoa;$(WXWIN)\src\common;$(WXWIN)\src\dfb;$(WXWIN)\src\expat;$(WXWIN)\src\generic;$(WXWIN)\src\gtk;$(WXWIN)\src\gtk1;$(WXWIN)\src\html;$(WXWIN)\src\jpeg;$(WXWIN)\src\motif;$(WXWIN)\src\msdos;$(WXWIN)\src\msw;$(WXWIN)\src\os2;$(WXWIN)\src\osx;$(WXWIN)\src\png;$(WXWIN)\src\propgrid;$(WXWIN)\src\regex;$(WXWIN)\src\ribbon;$(WXWIN)\src\richtext;$(WXWIN)\src\stc;$(WXWIN)\src\tiff;$(WXWIN)\src\univ;$(WXWIN)\src\unix;$(WXWIN)\src\x11;$(WXWIN)\src\xml;$(WXWIN)\src\xrc;$(WXWIN)\src\zlib;$(SourcePath) + + + + Level4 + NTDDI_VERSION=NTDDI_WINXP;_WIN32_WINNT=_WIN32_WINNT_WINXP;wxMSVC_VERSION_AUTO;WXUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Use + stdafx.h + ProgramDatabase + true + 4100;4505 + + + true + true + true + + + WINVER=0x0501;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions) + + + Amperstand + $(OutDir)..\locale\%(Filename)\$(ProjectName).mo + + + + \ No newline at end of file diff --git a/include/x64.props b/include/x64.props new file mode 100644 index 0000000..f653eef --- /dev/null +++ b/include/x64.props @@ -0,0 +1,39 @@ + + + + + + + + + <_PropertySheetDisplayName>MSICA x64 + $(WXWIN)\lib\vc$(PlatformToolsetVersion)_x64_dll;$(LibraryPath) + + + + MachineX64 + + + Windows + MachineX64 + + + + \ No newline at end of file diff --git a/include/xgettext.props b/include/xgettext.props new file mode 100644 index 0000000..994a876 --- /dev/null +++ b/include/xgettext.props @@ -0,0 +1,45 @@ + + + + + Midl + CustomBuild + + + _SelectedFiles;$(POCompilationDependsOn) + + + + MO + false + false + false + false + false + None + $(OutDir)%(Filename).mo + false + 1 + LSB + + msgfmt.exe [AllOptions] [AdditionalOptions] [Inputs] + + + \ No newline at end of file diff --git a/include/xgettext.targets b/include/xgettext.targets new file mode 100644 index 0000000..6d3e6d7 --- /dev/null +++ b/include/xgettext.targets @@ -0,0 +1,65 @@ + + + + + + + POCompile + + + + $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml + + + + + + + + + + + + + POCompilationClean;$(CleanDependsOn); + + \ No newline at end of file diff --git a/include/xgettext.xml b/include/xgettext.xml new file mode 100644 index 0000000..aa3779b --- /dev/null +++ b/include/xgettext.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/MSICALib b/lib/MSICALib new file mode 160000 index 0000000..cf1869f --- /dev/null +++ b/lib/MSICALib @@ -0,0 +1 @@ +Subproject commit cf1869f495220952cf0ed992d1adab1a0149bef9 diff --git a/lib/WinStd b/lib/WinStd new file mode 160000 index 0000000..79b9ac4 --- /dev/null +++ b/lib/WinStd @@ -0,0 +1 @@ +Subproject commit 79b9ac4371ffc9feb055587a5824e49030deb06d