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

MiniPath now included in Setup

Browse Source 
MiniPath now included in Setup. Change the main license file to include
MiniPath (metpath)
This commit is contained in:
Derick Payne 2015-11-17 16:17:35 +02:00
parent 3202a2346c
commit b147e7c276
16 changed files with 39 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build/Build.bat
View File

@ -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"

85
Build/coverity.bat
View File

@ -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

6
Build/make_all.bat
View File

@ -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

7
Build/make_zip.bat
View File

@ -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!"

75
Build/sign.bat
View File

@ -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

6
Build/upx.bat
View File

@ -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 ______________________________

4
License.txt
View File

@ -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

2
Version.ini
View File

@ -1,4 +1,4 @@
[Version]
Build=236
Build=239
VersionHeader=src\VersionEx.h
ManifestConfig=res\Notepad3.exe.manifest.conf

BIN
distrib/minipath.ini Normal file
View File

Binary file not shown.

23
distrib/notepad3_setup.iss
View File

@ -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

29
minipath/License.txt
View File

@ -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.

2
minipath/Version.ini
View File

@ -1,4 +1,4 @@
[Version]
Build=45
Build=47
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.4.45"
version="0.0.4.47"
type="win32"
/>
<description>metapath</description>

2
minipath/src/VersionEx.h
View File

@ -1,4 +1,4 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 0
#define VERSION_REV 4
#define VERSION_BUILD 45
#define VERSION_BUILD 47

2
res/Notepad3.exe.manifest
View File

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

2
src/VersionEx.h
View File

@ -1,4 +1,4 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 2
#define VERSION_REV 3
#define VERSION_BUILD 236
#define VERSION_BUILD 239