diff --git a/PanoPainter.sln b/PanoPainter.sln index e87960d..0bc5e76 100644 --- a/PanoPainter.sln +++ b/PanoPainter.sln @@ -1,28 +1,55 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2026 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PanoPainter", "PanoPainter.vcxproj", "{6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}" EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "PanoPainterPackage", "PanoPainterPackage\PanoPainterPackage.wapproj", "{3A716FB6-DE62-439F-83B6-3C40915D6678}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}.Debug|Any CPU.ActiveCfg = Debug|Win32 {6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}.Debug|x64.ActiveCfg = Debug|x64 {6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}.Debug|x64.Build.0 = Debug|x64 {6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}.Debug|x86.ActiveCfg = Debug|Win32 {6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}.Debug|x86.Build.0 = Debug|Win32 + {6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}.Release|Any CPU.ActiveCfg = Release|Win32 {6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}.Release|x64.ActiveCfg = Release|x64 {6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}.Release|x64.Build.0 = Release|x64 {6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}.Release|x86.ActiveCfg = Release|Win32 {6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}.Release|x86.Build.0 = Release|Win32 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Debug|x64.ActiveCfg = Debug|x64 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Debug|x64.Build.0 = Debug|x64 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Debug|x64.Deploy.0 = Debug|x64 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Debug|x86.ActiveCfg = Debug|x86 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Debug|x86.Build.0 = Debug|x86 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Debug|x86.Deploy.0 = Debug|x86 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Release|Any CPU.Build.0 = Release|Any CPU + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Release|Any CPU.Deploy.0 = Release|Any CPU + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Release|x64.ActiveCfg = Release|x64 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Release|x64.Build.0 = Release|x64 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Release|x64.Deploy.0 = Release|x64 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Release|x86.ActiveCfg = Release|x86 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Release|x86.Build.0 = Release|x86 + {3A716FB6-DE62-439F-83B6-3C40915D6678}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3E8EFC4B-CEA1-4408-8628-7D2C0F6C43C8} + EndGlobalSection EndGlobal diff --git a/PanoPainterPackage/Images/LargeTile.scale-100.png b/PanoPainterPackage/Images/LargeTile.scale-100.png new file mode 100644 index 0000000..e6b20d4 Binary files /dev/null and b/PanoPainterPackage/Images/LargeTile.scale-100.png differ diff --git a/PanoPainterPackage/Images/LargeTile.scale-125.png b/PanoPainterPackage/Images/LargeTile.scale-125.png new file mode 100644 index 0000000..6dc60b8 Binary files /dev/null and b/PanoPainterPackage/Images/LargeTile.scale-125.png differ diff --git a/PanoPainterPackage/Images/LargeTile.scale-150.png b/PanoPainterPackage/Images/LargeTile.scale-150.png new file mode 100644 index 0000000..858d94e Binary files /dev/null and b/PanoPainterPackage/Images/LargeTile.scale-150.png differ diff --git a/PanoPainterPackage/Images/LargeTile.scale-200.png b/PanoPainterPackage/Images/LargeTile.scale-200.png new file mode 100644 index 0000000..9fe80c0 Binary files /dev/null and b/PanoPainterPackage/Images/LargeTile.scale-200.png differ diff --git a/PanoPainterPackage/Images/LargeTile.scale-400.png b/PanoPainterPackage/Images/LargeTile.scale-400.png new file mode 100644 index 0000000..753ae75 Binary files /dev/null and b/PanoPainterPackage/Images/LargeTile.scale-400.png differ diff --git a/PanoPainterPackage/Images/LockScreenLogo.scale-200.png b/PanoPainterPackage/Images/LockScreenLogo.scale-200.png new file mode 100644 index 0000000..735f57a Binary files /dev/null and b/PanoPainterPackage/Images/LockScreenLogo.scale-200.png differ diff --git a/PanoPainterPackage/Images/SmallTile.scale-100.png b/PanoPainterPackage/Images/SmallTile.scale-100.png new file mode 100644 index 0000000..1c07720 Binary files /dev/null and b/PanoPainterPackage/Images/SmallTile.scale-100.png differ diff --git a/PanoPainterPackage/Images/SmallTile.scale-125.png b/PanoPainterPackage/Images/SmallTile.scale-125.png new file mode 100644 index 0000000..c2a1902 Binary files /dev/null and b/PanoPainterPackage/Images/SmallTile.scale-125.png differ diff --git a/PanoPainterPackage/Images/SmallTile.scale-150.png b/PanoPainterPackage/Images/SmallTile.scale-150.png new file mode 100644 index 0000000..65208a4 Binary files /dev/null and b/PanoPainterPackage/Images/SmallTile.scale-150.png differ diff --git a/PanoPainterPackage/Images/SmallTile.scale-200.png b/PanoPainterPackage/Images/SmallTile.scale-200.png new file mode 100644 index 0000000..af8a015 Binary files /dev/null and b/PanoPainterPackage/Images/SmallTile.scale-200.png differ diff --git a/PanoPainterPackage/Images/SmallTile.scale-400.png b/PanoPainterPackage/Images/SmallTile.scale-400.png new file mode 100644 index 0000000..1adc87c Binary files /dev/null and b/PanoPainterPackage/Images/SmallTile.scale-400.png differ diff --git a/PanoPainterPackage/Images/SplashScreen.scale-100.png b/PanoPainterPackage/Images/SplashScreen.scale-100.png new file mode 100644 index 0000000..2b3f1b8 Binary files /dev/null and b/PanoPainterPackage/Images/SplashScreen.scale-100.png differ diff --git a/PanoPainterPackage/Images/SplashScreen.scale-125.png b/PanoPainterPackage/Images/SplashScreen.scale-125.png new file mode 100644 index 0000000..428f117 Binary files /dev/null and b/PanoPainterPackage/Images/SplashScreen.scale-125.png differ diff --git a/PanoPainterPackage/Images/SplashScreen.scale-150.png b/PanoPainterPackage/Images/SplashScreen.scale-150.png new file mode 100644 index 0000000..84a62ff Binary files /dev/null and b/PanoPainterPackage/Images/SplashScreen.scale-150.png differ diff --git a/PanoPainterPackage/Images/SplashScreen.scale-200.png b/PanoPainterPackage/Images/SplashScreen.scale-200.png new file mode 100644 index 0000000..90dc81c Binary files /dev/null and b/PanoPainterPackage/Images/SplashScreen.scale-200.png differ diff --git a/PanoPainterPackage/Images/SplashScreen.scale-400.png b/PanoPainterPackage/Images/SplashScreen.scale-400.png new file mode 100644 index 0000000..df9892d Binary files /dev/null and b/PanoPainterPackage/Images/SplashScreen.scale-400.png differ diff --git a/PanoPainterPackage/Images/Square150x150Logo.scale-100.png b/PanoPainterPackage/Images/Square150x150Logo.scale-100.png new file mode 100644 index 0000000..a0a0d2f Binary files /dev/null and b/PanoPainterPackage/Images/Square150x150Logo.scale-100.png differ diff --git a/PanoPainterPackage/Images/Square150x150Logo.scale-125.png b/PanoPainterPackage/Images/Square150x150Logo.scale-125.png new file mode 100644 index 0000000..761c53a Binary files /dev/null and b/PanoPainterPackage/Images/Square150x150Logo.scale-125.png differ diff --git a/PanoPainterPackage/Images/Square150x150Logo.scale-150.png b/PanoPainterPackage/Images/Square150x150Logo.scale-150.png new file mode 100644 index 0000000..d1f7bb2 Binary files /dev/null and b/PanoPainterPackage/Images/Square150x150Logo.scale-150.png differ diff --git a/PanoPainterPackage/Images/Square150x150Logo.scale-200.png b/PanoPainterPackage/Images/Square150x150Logo.scale-200.png new file mode 100644 index 0000000..c02569f Binary files /dev/null and b/PanoPainterPackage/Images/Square150x150Logo.scale-200.png differ diff --git a/PanoPainterPackage/Images/Square150x150Logo.scale-400.png b/PanoPainterPackage/Images/Square150x150Logo.scale-400.png new file mode 100644 index 0000000..6f98b8b Binary files /dev/null and b/PanoPainterPackage/Images/Square150x150Logo.scale-400.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-16.png new file mode 100644 index 0000000..8ef64cc Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-16.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 0000000..2413047 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-32.png new file mode 100644 index 0000000..f94b7a6 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-32.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-48.png new file mode 100644 index 0000000..a8dfc96 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.altform-unplated_targetsize-48.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.scale-100.png b/PanoPainterPackage/Images/Square44x44Logo.scale-100.png new file mode 100644 index 0000000..32cdcd5 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.scale-100.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.scale-125.png b/PanoPainterPackage/Images/Square44x44Logo.scale-125.png new file mode 100644 index 0000000..91b04a7 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.scale-125.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.scale-150.png b/PanoPainterPackage/Images/Square44x44Logo.scale-150.png new file mode 100644 index 0000000..8190841 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.scale-150.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.scale-200.png b/PanoPainterPackage/Images/Square44x44Logo.scale-200.png new file mode 100644 index 0000000..2024089 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.scale-200.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.scale-400.png b/PanoPainterPackage/Images/Square44x44Logo.scale-400.png new file mode 100644 index 0000000..6e078f1 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.scale-400.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.targetsize-16.png b/PanoPainterPackage/Images/Square44x44Logo.targetsize-16.png new file mode 100644 index 0000000..431a4c8 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.targetsize-16.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.targetsize-24.png b/PanoPainterPackage/Images/Square44x44Logo.targetsize-24.png new file mode 100644 index 0000000..b1cc780 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.targetsize-24.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/PanoPainterPackage/Images/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000..3221545 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.targetsize-256.png b/PanoPainterPackage/Images/Square44x44Logo.targetsize-256.png new file mode 100644 index 0000000..7e43d3d Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.targetsize-256.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.targetsize-32.png b/PanoPainterPackage/Images/Square44x44Logo.targetsize-32.png new file mode 100644 index 0000000..66c60ce Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.targetsize-32.png differ diff --git a/PanoPainterPackage/Images/Square44x44Logo.targetsize-48.png b/PanoPainterPackage/Images/Square44x44Logo.targetsize-48.png new file mode 100644 index 0000000..653bbc5 Binary files /dev/null and b/PanoPainterPackage/Images/Square44x44Logo.targetsize-48.png differ diff --git a/PanoPainterPackage/Images/StoreLogo.backup.png b/PanoPainterPackage/Images/StoreLogo.backup.png new file mode 100644 index 0000000..7385b56 Binary files /dev/null and b/PanoPainterPackage/Images/StoreLogo.backup.png differ diff --git a/PanoPainterPackage/Images/StoreLogo.scale-100.png b/PanoPainterPackage/Images/StoreLogo.scale-100.png new file mode 100644 index 0000000..8bbe861 Binary files /dev/null and b/PanoPainterPackage/Images/StoreLogo.scale-100.png differ diff --git a/PanoPainterPackage/Images/StoreLogo.scale-125.png b/PanoPainterPackage/Images/StoreLogo.scale-125.png new file mode 100644 index 0000000..9a5d750 Binary files /dev/null and b/PanoPainterPackage/Images/StoreLogo.scale-125.png differ diff --git a/PanoPainterPackage/Images/StoreLogo.scale-150.png b/PanoPainterPackage/Images/StoreLogo.scale-150.png new file mode 100644 index 0000000..aec2644 Binary files /dev/null and b/PanoPainterPackage/Images/StoreLogo.scale-150.png differ diff --git a/PanoPainterPackage/Images/StoreLogo.scale-200.png b/PanoPainterPackage/Images/StoreLogo.scale-200.png new file mode 100644 index 0000000..96753eb Binary files /dev/null and b/PanoPainterPackage/Images/StoreLogo.scale-200.png differ diff --git a/PanoPainterPackage/Images/StoreLogo.scale-400.png b/PanoPainterPackage/Images/StoreLogo.scale-400.png new file mode 100644 index 0000000..7d4a0f0 Binary files /dev/null and b/PanoPainterPackage/Images/StoreLogo.scale-400.png differ diff --git a/PanoPainterPackage/Images/Wide310x150Logo.scale-100.png b/PanoPainterPackage/Images/Wide310x150Logo.scale-100.png new file mode 100644 index 0000000..703d210 Binary files /dev/null and b/PanoPainterPackage/Images/Wide310x150Logo.scale-100.png differ diff --git a/PanoPainterPackage/Images/Wide310x150Logo.scale-125.png b/PanoPainterPackage/Images/Wide310x150Logo.scale-125.png new file mode 100644 index 0000000..9762ec9 Binary files /dev/null and b/PanoPainterPackage/Images/Wide310x150Logo.scale-125.png differ diff --git a/PanoPainterPackage/Images/Wide310x150Logo.scale-150.png b/PanoPainterPackage/Images/Wide310x150Logo.scale-150.png new file mode 100644 index 0000000..7570235 Binary files /dev/null and b/PanoPainterPackage/Images/Wide310x150Logo.scale-150.png differ diff --git a/PanoPainterPackage/Images/Wide310x150Logo.scale-200.png b/PanoPainterPackage/Images/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000..2b3f1b8 Binary files /dev/null and b/PanoPainterPackage/Images/Wide310x150Logo.scale-200.png differ diff --git a/PanoPainterPackage/Images/Wide310x150Logo.scale-400.png b/PanoPainterPackage/Images/Wide310x150Logo.scale-400.png new file mode 100644 index 0000000..90dc81c Binary files /dev/null and b/PanoPainterPackage/Images/Wide310x150Logo.scale-400.png differ diff --git a/PanoPainterPackage/Package.StoreAssociation.xml b/PanoPainterPackage/Package.StoreAssociation.xml new file mode 100644 index 0000000..c41291a --- /dev/null +++ b/PanoPainterPackage/Package.StoreAssociation.xml @@ -0,0 +1,369 @@ + + + CN=A7839FC0-1534-49A5-BD18-1D5AF8852B9B + OmixLab Ltd + MSA + http://www.w3.org/2001/04/xmlenc#sha256 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OmixLabLtd.PanoPainter + + PanoPainter + + + + + \ No newline at end of file diff --git a/PanoPainterPackage/Package.appxmanifest b/PanoPainterPackage/Package.appxmanifest new file mode 100644 index 0000000..4e4db28 --- /dev/null +++ b/PanoPainterPackage/Package.appxmanifest @@ -0,0 +1,29 @@ + + + + + PanoPainter + OmixLab Ltd + Images\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PanoPainterPackage/PanoPainterPackage.wapproj b/PanoPainterPackage/PanoPainterPackage.wapproj new file mode 100644 index 0000000..abf009b --- /dev/null +++ b/PanoPainterPackage/PanoPainterPackage.wapproj @@ -0,0 +1,141 @@ + + + + 15.0 + + + + Debug + x86 + + + Release + x86 + + + Debug + x64 + + + Release + x64 + + + Debug + AnyCPU + + + Release + AnyCPU + + + + OnBuildSuccess + + + python "$(SolutionDir)scripts\manifest-version.py" "$(SolutionDir)PanoPainterPackage\Package.appxmanifest" $(Configuration) + + + $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ + + + + 3a716fb6-de62-439f-83b6-3c40915d6678 + 10.0.17134.0 + 10.0.16299.0 + en-US + PanoPainterPackage_StoreKey.pfx + ..\PanoPainter.vcxproj + False + False + x64 + 6977634CFB3DEB63FE32B05409BF2BF37D01A94E + 1 + OnApplicationRun + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PanoPainter\data\%(RecursiveDir)%(FileName)%(Extension) + + + + + + + + + \ No newline at end of file diff --git a/PanoPainterPackage/PanoPainterPackage.wapproj.user b/PanoPainterPackage/PanoPainterPackage.wapproj.user new file mode 100644 index 0000000..aa7eaa8 --- /dev/null +++ b/PanoPainterPackage/PanoPainterPackage.wapproj.user @@ -0,0 +1,26 @@ + + + + D:\Dev\panopainter\icon.png + D:\Dev\panopainter\icon.png + D:\Dev\panopainter\icon.png + D:\Dev\panopainter\icon.png + D:\Dev\panopainter\icon.png + D:\Dev\panopainter\icon.png + D:\Dev\panopainter\icon.png + D:\Dev\panopainter\icon.png + True + False + x64 + False + false + + + AppHostLocalDebugger + False + + + AppHostLocalDebugger + False + + \ No newline at end of file diff --git a/PanoPainterPackage/PanoPainterPackage_StoreKey.pfx b/PanoPainterPackage/PanoPainterPackage_StoreKey.pfx new file mode 100644 index 0000000..2b263dc Binary files /dev/null and b/PanoPainterPackage/PanoPainterPackage_StoreKey.pfx differ diff --git a/PanoPainterPackage/PanoPainterPackage_TemporaryKey.pfx b/PanoPainterPackage/PanoPainterPackage_TemporaryKey.pfx new file mode 100644 index 0000000..0e69ec9 Binary files /dev/null and b/PanoPainterPackage/PanoPainterPackage_TemporaryKey.pfx differ diff --git a/scripts/manifest-version.py b/scripts/manifest-version.py new file mode 100644 index 0000000..34f0b69 --- /dev/null +++ b/scripts/manifest-version.py @@ -0,0 +1,35 @@ +from subprocess import Popen, PIPE, check_output +from tempfile import mkstemp +from shutil import move +from os import remove, close +import re, subprocess, sys + +branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).rstrip().decode("utf-8") +shorthash = check_output(["git", "log", "--pretty=format:%h", "-n 1"]).rstrip().decode("utf-8") +revcount = int(check_output(["git", "rev-list", "--count", "HEAD"])) +tag = check_output(["git", "describe", "--tags", "--abbrev=0"]).rstrip().decode("utf-8") +config = sys.argv[2].lower() + +version = "%s.%d (%s-%s-%s)" % (tag, revcount, shorthash, branch, config) +version_number = "%s.%d" % (tag, revcount) + +version_parts = version_number.split('.') + +print("Compiling version: %s" % version) + +file_path = sys.argv[1]; +#Create temp file +fh, abs_path = mkstemp() +regex = re.compile(r'(.*]+Version=)("\d+\.\d+\.\d+\.\d+")') +with open(abs_path,'w') as new_file: + with open(file_path) as old_file: + for line in old_file: + new_line = regex.sub(r'\1"%s"' % version_number, line) + new_file.write(new_line) +close(fh) +#Remove original file +remove(file_path) +#Move new file +move(abs_path, file_path) + +exit(0) diff --git a/src/main.cpp b/src/main.cpp index 2c1cc81..ad3cad3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -302,6 +302,25 @@ int main(int argc, char** argv) return -1; } + + FILE* fp_check = fopen("data\\layout.xml", "rb"); + if (!fp_check) + { + LOG("data files not found"); + static char path[MAX_PATH]; + GetModuleFileNameA(NULL, path, MAX_PATH); + LOG("current dir %s", path); + PathRemoveFileSpecA(path); + SetCurrentDirectoryA(path); + LOG("change dir to %s", path); + } + else + { + fclose(fp_check); + LOG("data files ok"); + } + + SetupExceptionHandler(); BT_SetTerminate();