CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Build Environment Cleanup

Browse Source 
Build Environment Cleanup
This commit is contained in:
Derick Payne 2016-06-03 13:13:46 +02:00
parent 5f108132ae
commit 124ab91e84
12 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitignore vendored
View File

@ -31,4 +31,13 @@ Thumbs.db
/distrib/Notepad3.*.exe
/Build/Bin/upx.exe
distrib/Notepad3-0.2.1.213.exe
distrib/Notepad3-0.2.2.225.exe
distrib/Notepad3-0.2.2.225.exe
Build/Bin/Password.txt
Build/Bin/Certum.cer
Build/Bin/Certum.p12
Build/sign.bat
Build/Signing/Certum.cer
Build/Signing/Certum.p12
Build/Signing/kSign.exe
Build/Signing/kSignCMD.exe
Build/Signing/Password.txt

5
Build/make_all.bat
View File

@ -21,8 +21,9 @@ CD /D %~dp0
CALL "Build.bat"
CALL "upx.bat"
rem CALL "make_zip.bat"
rem CALL "make_installer.bat"
CALL "sign.bat"
CALL "make_zip.bat"
CALL "make_installer.bat"
:END
TITLE Finished!

2
Build/make_installer.bat
View File

@ -92,7 +92,7 @@ EXIT /B
TITLE Building %1 installer...
CALL :SUBMSG "INFO" "Building %1 installer using %InnoSetupPath%\ISCC.exe..."
"%InnoSetupPath%\ISCC.exe" /SMySignTool="cmd /c "%~dp0sign.bat" $f" /Q /O"packages" "..\distrib\notepad3_setup.iss" /D%1
"%InnoSetupPath%\ISCC.exe" /Q /O "packages" "..\distrib\notepad3_setup.iss" /D%1
IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
EXIT /B

2
Version.ini
View File

@ -7,7 +7,7 @@ Language=CPlusPlus
Major=auto
Minor=auto
Maintenance=auto
Build=293
Build=302
[CSharp]
AssemConfig=Rizonesoft.Voice.Win\Properties\AssemblyInfo.cs.conf

2
minipath/Version.ini
View File

@ -1,4 +1,4 @@
[Version]
Build=62
Build=72
VersionHeader=src\VersionEx.h
ManifestConfig=res\MiniPath.exe.manifest.conf

2
minipath/res/MiniPath.exe.manifest
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="MiniPath"
processorArchitecture="*"
version="0.0.6.62"
version="0.0.7.72"
type="win32"
/>
<description>metapath</description>

4
minipath/src/VersionEx.h
View File

@ -1,4 +1,4 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 0
#define VERSION_REV 6
#define VERSION_BUILD 62
#define VERSION_REV 7
#define VERSION_BUILD 72

2
res/Notepad3.exe.manifest
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="0.2.9.293"
version="0.3.0.302"
type="win32"
/>
<description>Notepad3</description>

17
scintilla/Scintilla.vcxproj
View File

@ -23,6 +23,7 @@
<ProjectGuid>{5877B917-512B-49F5-B514-1B4159E7A9CA}</ProjectGuid>
<ProjectName>Scintilla</ProjectName>
<RootNamespace>Scintilla</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -80,35 +81,35 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>

3
scintilla/Scintilla.vcxproj.filters
View File

@ -395,9 +395,6 @@
<ClInclude Include="src\XPM.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="win32\HanjaDic.h">
<Filter>win32</Filter>
</ClInclude>
<ClInclude Include="win32\PlatWin.h">
<Filter>win32</Filter>
</ClInclude>

2
src/Version.h
View File

@ -66,7 +66,7 @@
#elif defined(_MSC_VER)
#if _MSC_VER == 1900
#if (_MSC_FULL_VER == 190023506)
#define VERSION_COMPILER L"Microsoft Visual C++ Update 1"
#define VERSION_COMPILER L"Microsoft Visual C++ 2015 Update 1"
#elif (_MSC_FULL_VER == 190023026)
#define VERSION_COMPILER L"Microsoft Visual C++ 2015"
#elif (_MSC_FULL_VER < 190023026)

6
src/VersionEx.h
View File

@ -1,4 +1,4 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 2
#define VERSION_REV 9
#define VERSION_BUILD 293
#define VERSION_MINOR 3
#define VERSION_REV 0
#define VERSION_BUILD 302