From b147e7c2765e42f8fc408c0b321f751e5c2afe4e Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Tue, 17 Nov 2015 16:17:35 +0200 Subject: [PATCH] MiniPath now included in Setup MiniPath now included in Setup. Change the main license file to include MiniPath (metpath) --- Build/Build.bat | 2 - Build/coverity.bat | 85 ----------------------------- Build/make_all.bat | 6 +- Build/make_zip.bat | 7 ++- Build/sign.bat | 75 ------------------------- Build/upx.bat | 6 ++ License.txt | 4 +- Version.ini | 2 +- distrib/minipath.ini | Bin 0 -> 3012 bytes distrib/notepad3_setup.iss | 23 ++++++-- minipath/License.txt | 29 ---------- minipath/Version.ini | 2 +- minipath/res/MiniPath.exe.manifest | 2 +- minipath/src/VersionEx.h | 2 +- res/Notepad3.exe.manifest | 2 +- src/VersionEx.h | 2 +- 16 files changed, 39 insertions(+), 210 deletions(-) delete mode 100644 Build/coverity.bat delete mode 100644 Build/sign.bat create mode 100644 distrib/minipath.ini delete mode 100644 minipath/License.txt diff --git a/Build/Build.bat b/Build/Build.bat index 0d31fc0f1..a512ebea5 100644 --- a/Build/Build.bat +++ b/Build/Build.bat @@ -21,7 +21,6 @@ CD /D %~dp0 rem Check the building environment IF NOT DEFINED VS140COMNTOOLS CALL :SUBMSG "ERROR" "Visual Studio 2015 wasn't found!" - rem Check for the help switches IF /I "%~1" == "help" GOTO SHOWHELP IF /I "%~1" == "/help" GOTO SHOWHELP @@ -29,7 +28,6 @@ IF /I "%~1" == "-help" GOTO SHOWHELP IF /I "%~1" == "--help" GOTO SHOWHELP IF /I "%~1" == "/?" GOTO SHOWHELP - rem Check for the first switch IF "%~1" == "" ( SET "BUILDTYPE=Build" diff --git a/Build/coverity.bat b/Build/coverity.bat deleted file mode 100644 index eb736d613..000000000 --- a/Build/coverity.bat +++ /dev/null @@ -1,85 +0,0 @@ -@ECHO OFF -rem ****************************************************************************** -rem * -rem * Notepad2-mod -rem * -rem * coverity.bat -rem * Batch file used to create the coverity scan analysis file -rem * Originally taken and adapted from https://github.com/mpc-hc/mpc-hc -rem * -rem * See License.txt for details about distribution and modification. -rem * -rem * (c) XhmikosR 2013-2015 -rem * https://github.com/XhmikosR/notepad2-mod -rem * -rem ****************************************************************************** - - -SETLOCAL - -PUSHD %~dp0 - -IF NOT DEFINED COVDIR SET "COVDIR=H:\progs\thirdparty\cov-analysis-win64" -IF DEFINED COVDIR IF NOT EXIST "%COVDIR%" ( - ECHO. - ECHO ERROR: Coverity not found in "%COVDIR%" - GOTO End -) - - -CALL "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86 -IF %ERRORLEVEL% NEQ 0 ( - ECHO vcvarsall.bat call failed. - GOTO End -) - - -:Cleanup -IF EXIST "cov-int" RD /q /s "cov-int" -IF EXIST "Notepad2-mod.lzma" DEL "Notepad2-mod.lzma" -IF EXIST "Notepad2-mod.tar" DEL "Notepad2-mod.tar" -IF EXIST "Notepad2-mod.tgz" DEL "Notepad2-mod.tgz" - - -:Main -"%COVDIR%\bin\cov-build.exe" --dir cov-int "build_vs2015.bat" Rebuild All Release - - -:tar -tar --version 1>&2 2>NUL || (ECHO. & ECHO ERROR: tar not found & GOTO SevenZip) -tar caf "Notepad2-mod.lzma" "cov-int" -GOTO End - - -:SevenZip -CALL :SubDetectSevenzipPath - -rem Coverity is totally bogus with lzma... -rem And since I cannot replicate the arguments with 7-Zip, just use tar/gzip. -IF EXIST "%SEVENZIP%" ( - "%SEVENZIP%" a -ttar "Notepad2-mod.tar" "cov-int" - "%SEVENZIP%" a -tgzip "Notepad2-mod.tgz" "Notepad2-mod.tar" - IF EXIST "Notepad2-mod.tar" DEL "Notepad2-mod.tar" - GOTO End -) - - -:SubDetectSevenzipPath -FOR %%G IN (7z.exe) DO (SET "SEVENZIP_PATH=%%~$PATH:G") -IF EXIST "%SEVENZIP_PATH%" (SET "SEVENZIP=%SEVENZIP_PATH%" & EXIT /B) - -FOR %%G IN (7za.exe) DO (SET "SEVENZIP_PATH=%%~$PATH:G") -IF EXIST "%SEVENZIP_PATH%" (SET "SEVENZIP=%SEVENZIP_PATH%" & EXIT /B) - -FOR /F "tokens=2*" %%A IN ( - 'REG QUERY "HKLM\SOFTWARE\7-Zip" /v "Path" 2^>NUL ^| FIND "REG_SZ" ^|^| - REG QUERY "HKLM\SOFTWARE\Wow6432Node\7-Zip" /v "Path" 2^>NUL ^| FIND "REG_SZ"') DO SET "SEVENZIP=%%B\7z.exe" -EXIT /B - - -:End -POPD -ECHO. & ECHO Press any key to close this window... -PAUSE >NUL -ENDLOCAL -EXIT /B diff --git a/Build/make_all.bat b/Build/make_all.bat index cc1313eac..a749e6c70 100644 --- a/Build/make_all.bat +++ b/Build/make_all.bat @@ -21,14 +21,12 @@ CD /D %~dp0 CALL "Build.bat" CALL "upx.bat" -rem CALL "make_installer.bat" - rem CALL "make_zip.bat" - +rem CALL "make_installer.bat" :END TITLE Finished! ECHO. PAUSE ENDLOCAL -EXIT /B +EXIT /B \ No newline at end of file diff --git a/Build/make_zip.bat b/Build/make_zip.bat index 2a6dc6c2f..49933c616 100644 --- a/Build/make_zip.bat +++ b/Build/make_zip.bat @@ -30,7 +30,9 @@ SET INPUTDIRx64=bin\Release_x64 SET "TEMP_NAME=temp_zip" IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x86 first!" +IF NOT EXIST "..\%INPUTDIRx86%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x86 first!" IF NOT EXIST "..\%INPUTDIRx64%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x64 first!" +IF NOT EXIST "..\%INPUTDIRx64%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x64 first!" CALL :SubGetVersion CALL :SubDetectSevenzipPath @@ -84,7 +86,8 @@ IF NOT EXIST "%TEMP_NAME%" MD "%TEMP_NAME%" IF NOT EXIST "packages" MD "packages" FOR %%A IN ("..\License.txt" "..\%1\Notepad3.exe"^ - "..\distrib\Notepad3.ini" "..\distrib\Readme.txt" + "..\distrib\Notepad3.ini" "..\distrib\Readme.txt"^ + "..\%1\minipath.exe" ) DO COPY /Y /V "%%A" "%TEMP_NAME%\" SET "FAVORITES=%TEMP_NAME%\Favorites" @@ -94,7 +97,7 @@ IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%" PUSHD "%TEMP_NAME%" "%SEVENZIP%" a -tzip -mx=9^ "%ZIP_NAME%.zip" "License.txt" "Notepad3.exe"^ - "Notepad3.ini" "Readme.txt" "Favorites" >NUL + "Notepad3.ini" "Readme.txt" "Favorites" "minipath.exe">NUL IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!" CALL :SUBMSG "INFO" "%ZIP_NAME%.zip created successfully!" diff --git a/Build/sign.bat b/Build/sign.bat deleted file mode 100644 index 3c97df751..000000000 --- a/Build/sign.bat +++ /dev/null @@ -1,75 +0,0 @@ -@ECHO OFF -rem ****************************************************************************** -rem * -rem * Notepad2-mod -rem * -rem * sign.bat -rem * Batch file used to sign the binaries -rem * Originally taken and adapted from https://github.com/mpc-hc/mpc-hc -rem * -rem * See License.txt for details about distribution and modification. -rem * -rem * (c) XhmikosR 2013-2015 -rem * https://github.com/XhmikosR/notepad2-mod -rem * -rem ****************************************************************************** - - -SETLOCAL - -IF "%~1" == "" ( - ECHO %~nx0: No input specified! - SET SIGN_ERROR=True - GOTO END -) - -IF NOT DEFINED VS140COMNTOOLS ( - ECHO %~nx0: Visual Studio 2015 does not seem to be installed... - SET SIGN_ERROR=True - GOTO END -) - -IF NOT EXIST "%~dp0..\signinfo_notepad2-mod.txt" ( - ECHO %~nx0: %~dp0..\signinfo_notepad2-mod.txt is not present! - SET SIGN_ERROR=True - GOTO END -) - -SET SIGN_CMD= -SET /P SIGN_CMD=<%~dp0..\signinfo_notepad2-mod.txt - -TITLE Signing "%~1"... -ECHO. & ECHO Signing "%~1"... - -signtool /? 2>NUL || CALL "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" 2>NUL -IF %ERRORLEVEL% NEQ 0 ( - ECHO vcvarsall.bat call failed. - GOTO End -) - -REM Repeat n times when signing fails -SET REPEAT=3 -SET TRY=0 - -:SIGN -signtool sign %SIGN_CMD% "%~1" -SET /A TRY+=1 -IF %ERRORLEVEL% NEQ 0 ( - IF TRY LSS REPEAT ( - REM Wait 5 seconds before next try - PING -n 5 127.0.0.1 >NUL - GOTO SIGN - ) - SET SIGN_ERROR=True - GOTO END -) - - -:END -IF /I "%SIGN_ERROR%" == "True" ( - IF "%~1" == "" PAUSE - ENDLOCAL - EXIT /B 1 -) -ENDLOCAL -EXIT /B diff --git a/Build/upx.bat b/Build/upx.bat index 6e7f33b67..5f1e1e596 100644 --- a/Build/upx.bat +++ b/Build/upx.bat @@ -22,10 +22,16 @@ SET INPUTDIRx64=bin\Release_x64 IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x86 first!" IF NOT EXIST "..\%INPUTDIRx64%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x64 first!" ECHO. +ECHO. Bin\UPX --brute "..\%INPUTDIRx86%\Notepad3.exe" ECHO. +Bin\UPX --brute "..\%INPUTDIRx86%\minipath.exe" +ECHO. Bin\UPX --brute "..\%INPUTDIRx64%\Notepad3.exe" ECHO. +Bin\UPX --brute "..\%INPUTDIRx64%\minipath.exe" +ECHO. +ECHO. :SUBMSG ECHO. & ECHO ______________________________ diff --git a/License.txt b/License.txt index 34419a1e5..f19dc5140 100644 --- a/License.txt +++ b/License.txt @@ -1,7 +1,7 @@ -Notepad3 Copyright © 2008-2016 Rizonesoft, All rights reserved. +Notepad3 and MiniPath Copyright © 2008-2016 Rizonesoft, All rights reserved. https://rizonesoft.com -Notepad2 Copyright © 2004-2011 Florian Balmer +Notepad2 and metapath Copyright © 2004-2011 Florian Balmer Notepad2-mod Copyright © 2010-2014 All contributors, see Readme.txt Redistribution and use in source and binary forms, with or without diff --git a/Version.ini b/Version.ini index 0da9b9edb..7de02ea0f 100644 --- a/Version.ini +++ b/Version.ini @@ -1,4 +1,4 @@ [Version] -Build=236 +Build=239 VersionHeader=src\VersionEx.h ManifestConfig=res\Notepad3.exe.manifest.conf diff --git a/distrib/minipath.ini b/distrib/minipath.ini new file mode 100644 index 0000000000000000000000000000000000000000..a1958ffba1097606852d0c1221036df31d8923d5 GIT binary patch literal 3012 zcmb7`T~8ZF6o$`rr2Gfp1f{7$AWf4-C>I7psT31hgJ|UB!nKX<)E}$00h1r!_Ic;b z?AokTD?*EB=6t{BW9Hv~+BUI~P5CnG*usYP*&f>?JE)xRM!t9U#IEc&JF^D=|6up2 z!uy=lOKaIN^fRkllhqST8n)}N+c|#?Bro_jSyjQs%G-w%Yq!wu#qA-hT1h@HRV^C zQN-?5i@oF)P&1+z3XbrMRkCsd&n;3pbRjd3(!V1$A~U!A?-Ru?|CfBO`yur_SQ1i6 z{sT6J-c`^$jP?^=qkv-*sd-Tit>DE1q_QHCq%F~u5!G6bT=L}v3(BMaDuz6IdB%Ex z4dEiGDu-&~I_6avsA{%zRXMyezOA98S7nuX)zx1C!$WXak13C3^h5S{p+-v1lx3%R zww3F7)U-}-gbWLXLv$@8Lcg+>tp@f7beY%UpOIS4;rDZWjJkwCM%Af)<;7-;)fw|L zP8nrhvGqemP3Zw4;xV4HR-Jcd14iDbTl5 zkm!X~>Ly{KS*0$yxA*WUigEOyz2?>DF!|bRm6WFC4wF_hq!y{(anIIFHuX@mzQeqV-ekHHohluo_2%dK;_{ zu`!7nd_9gkVJlkNFIUzXv@G%|KgqW*#cI{#0eB}bGdvzd$uH&2RbM8ek>5`mq&=f1*D~Tc;lrzmP&7*WKJXY@uoww;vp{VR@Ce*=CRijGv zn@&ji1oAi1D*t9~uaND0y5;qD{T_b3@XA-gb{p&Oo9+BpMBAg|HK{aB+_wgJ9+Lre Vh^kp=ty2CE2bWd7X8~20`wt#}?JWQR literal 0 HcmV?d00001 diff --git a/distrib/notepad3_setup.iss b/distrib/notepad3_setup.iss index a45a84ce4..93af48e4a 100644 --- a/distrib/notepad3_setup.iss +++ b/distrib/notepad3_setup.iss @@ -10,16 +10,24 @@ #error Update your Inno Setup version (5.5.6 or newer) #endif -#define bindir "..\bin" +#define bindir "..\Bin" #ifnexist bindir + "\Release_x86\Notepad3.exe" #error Compile Notepad3 x86 first #endif +#ifnexist bindir + "\Release_x86\minipath.exe" + #error Compile MiniPath x86 first +#endif + #ifnexist bindir + "\Release_x64\Notepad3.exe" #error Compile Notepad3 x64 first #endif +#ifnexist bindir + "\Release_x64\minipath.exe" + #error Compile MiniPath x64 first +#endif + #define app_version GetFileVersion(bindir + "\Release_x86\Notepad3.exe") #define app_name "Notepad3" #define app_copyright "Copyright © 2008-2016, Rizonesoft." @@ -112,7 +120,9 @@ Source: {#bindir}\Release_x86\Notepad3.exe; DestDir: {app}; Source: License.txt; DestDir: {app}; Flags: ignoreversion Source: Readme.txt; DestDir: {app}; Flags: ignoreversion Source: Notepad3.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall - +Source: {#bindir}\Release_x64\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode() +Source: {#bindir}\Release_x86\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode() +Source: minipath.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall [Icons] Name: {commondesktop}\{#app_name}; Filename: {app}\Notepad3.exe; Tasks: desktopicon\common; Comment: {#app_name} {#app_version}; WorkingDir: {app}; AppUserModelID: Notepad3; IconFilename: {app}\Notepad3.exe; IconIndex: 0 @@ -123,6 +133,7 @@ Name: {#quick_launch}\{#app_name}; Filename: {app}\Notepad3.exe; Tasks: quicklau [INI] Filename: {app}\Notepad3.ini; Section: Notepad3; Key: Notepad3.ini; String: %APPDATA%\Rizonesoft\Notepad3\Notepad3.ini +Filename: {app}\minipath.ini; Section: minipath; Key: minipath.ini; String: %APPDATA%\Rizonesoft\Notepad3\minipath.ini [Run] @@ -136,10 +147,12 @@ Type: files; Name: {userstartmenu}\{#app_name}.lnk; Check: not IsTaskSelect Type: files; Name: {#quick_launch}\{#app_name}.lnk; Check: not IsTaskSelected('quicklaunchicon') and IsUpgrade(); OnlyBelowVersion: 6.01 Type: files; Name: {app}\Notepad3.ini Type: files; Name: {app}\Readme.txt +Type: files; Name: {app}\minipath.ini [UninstallDelete] Type: files; Name: {app}\Notepad3.ini +Type: files; Name: {app}\minipath.ini Type: dirifempty; Name: {app} @@ -189,8 +202,8 @@ end; function IsOldBuildInstalled(sInfFile: String): Boolean; begin - if RegKeyExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Notepad3') and - FileExists(ExpandConstant('{pf}\Notepad3\' + sInfFile)) then + if RegKeyExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Notepad2') and + FileExists(ExpandConstant('{pf}\Notepad2\' + sInfFile)) then Result := True else Result := False; @@ -232,7 +245,7 @@ begin // default return value Result := 0; // TODO: use RegQueryStringValue - if not Exec('rundll32.exe', ExpandConstant('advpack.dll,LaunchINFSectionEx ' + '"{pf}\Notepad3\' + sInfFile +'",DefaultUninstall,,8,N'), '', SW_HIDE, ewWaitUntilTerminated, iResultCode) then begin + if not Exec('rundll32.exe', ExpandConstant('advpack.dll,LaunchINFSectionEx ' + '"{pf}\Notepad2\' + sInfFile +'",DefaultUninstall,,8,N'), '', SW_HIDE, ewWaitUntilTerminated, iResultCode) then begin Result := 1; end else begin diff --git a/minipath/License.txt b/minipath/License.txt deleted file mode 100644 index 1468b4496..000000000 --- a/minipath/License.txt +++ /dev/null @@ -1,29 +0,0 @@ -metapath Copyright © 1996-2011 Florian Balmer -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. - -3. Neither the name of Florian Balmer nor the names of its contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/minipath/Version.ini b/minipath/Version.ini index 117aba96f..9c7cec4e4 100644 --- a/minipath/Version.ini +++ b/minipath/Version.ini @@ -1,4 +1,4 @@ [Version] -Build=45 +Build=47 VersionHeader=src\VersionEx.h ManifestConfig=res\MiniPath.exe.manifest.conf diff --git a/minipath/res/MiniPath.exe.manifest b/minipath/res/MiniPath.exe.manifest index ea91591a1..dffdc01b9 100644 --- a/minipath/res/MiniPath.exe.manifest +++ b/minipath/res/MiniPath.exe.manifest @@ -3,7 +3,7 @@ metapath diff --git a/minipath/src/VersionEx.h b/minipath/src/VersionEx.h index 80bf7dc38..45e2c925c 100644 --- a/minipath/src/VersionEx.h +++ b/minipath/src/VersionEx.h @@ -1,4 +1,4 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 0 #define VERSION_REV 4 -#define VERSION_BUILD 45 +#define VERSION_BUILD 47 diff --git a/res/Notepad3.exe.manifest b/res/Notepad3.exe.manifest index c7f9e104f..1e504c806 100644 --- a/res/Notepad3.exe.manifest +++ b/res/Notepad3.exe.manifest @@ -3,7 +3,7 @@ Notepad3 diff --git a/src/VersionEx.h b/src/VersionEx.h index 8246a0062..5b65b274e 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -1,4 +1,4 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 2 #define VERSION_REV 3 -#define VERSION_BUILD 236 +#define VERSION_BUILD 239