2
0
Alexander Koblov 4 жил өмнө
parent
commit
8a5cf1153c

+ 82 - 82
build.bat

@@ -1,82 +1,82 @@
-@echo off
-
-rem Add Lazarus installation to path
-if [%LAZARUS_HOME%] == [] set LAZARUS_HOME=D:\Alexx\Prog\FreePascal\Lazarus
-set PATH=%LAZARUS_HOME%;%PATH%
-
-rem You can execute this script with different parameters:
-rem components - compiling components needed for doublecmd
-rem doublecmd - compiling doublecmd only (release mode)
-rem plugins - compiling all doublecmd plugins
-rem debug - compiling components, plugins and doublecmd (debug mode)
-rem release - compile in release mode (using by default)
-if not "%OS_TARGET%" == "" (
-  set DC_ARCH=%DC_ARCH% --os=%OS_TARGET%
-)
-if not "%CPU_TARGET%" == "" (
-  set DC_ARCH=%DC_ARCH% --cpu=%CPU_TARGET%
-)
-if not "%LCL_PLATFORM%" == "" (
-  set DC_ARCH=%DC_ARCH% --ws=%LCL_PLATFORM%
-)
-
-if "%1"=="components" ( call :components
-) else (
-if "%1"=="plugins" ( call :plugins
-) else (
-if "%1"=="beta" ( call :release
-) else (
-if "%1"=="doublecmd" ( call :doublecmd
-) else (
-if "%1"=="release" ( call :release
-) else (
-if "%1"=="debug" ( call :debug
-) else (
-if "%1"=="" ( call :release
-) else (
-  echo ERROR: Mode not defined: %1
-  echo Available modes: components, plugins, doublecmd, release, debug
-)))))))
-
-pause
-GOTO:EOF
-
-:components
-  call components\build.bat
-GOTO:EOF
-
-:plugins
-  call plugins\build.bat
-GOTO:EOF
-
-:release
-  call :components
-  call :plugins
-  call :doublecmd
-GOTO:EOF
-
-:debug
-  call :components
-  call :plugins
-
-  rem Build Double Commander
-  call :replace_old
-  lazbuild src\doublecmd.lpi --bm=debug %DC_ARCH%
-GOTO:EOF
-
-:doublecmd
-  rem Build Double Commander
-  call :replace_old
-  lazbuild src\doublecmd.lpi --bm=release %DC_ARCH%
-
-  rem Build Dwarf LineInfo Extractor
-  lazbuild tools\extractdwrflnfo.lpi
-
-  rem Extract debug line info
-  tools\extractdwrflnfo doublecmd.dbg
-GOTO:EOF
-
-:replace_old
-  del /Q doublecmd.exe.old
-  ren doublecmd.exe doublecmd.exe.old
-GOTO:EOF
+@echo off
+
+rem Add Lazarus installation to path
+if [%LAZARUS_HOME%] == [] set LAZARUS_HOME=D:\Alexx\Prog\FreePascal\Lazarus
+set PATH=%LAZARUS_HOME%;%PATH%
+
+rem You can execute this script with different parameters:
+rem components - compiling components needed for doublecmd
+rem doublecmd - compiling doublecmd only (release mode)
+rem plugins - compiling all doublecmd plugins
+rem debug - compiling components, plugins and doublecmd (debug mode)
+rem release - compile in release mode (using by default)
+if not "%OS_TARGET%" == "" (
+  set DC_ARCH=%DC_ARCH% --os=%OS_TARGET%
+)
+if not "%CPU_TARGET%" == "" (
+  set DC_ARCH=%DC_ARCH% --cpu=%CPU_TARGET%
+)
+if not "%LCL_PLATFORM%" == "" (
+  set DC_ARCH=%DC_ARCH% --ws=%LCL_PLATFORM%
+)
+
+if "%1"=="components" ( call :components
+) else (
+if "%1"=="plugins" ( call :plugins
+) else (
+if "%1"=="beta" ( call :release
+) else (
+if "%1"=="doublecmd" ( call :doublecmd
+) else (
+if "%1"=="release" ( call :release
+) else (
+if "%1"=="debug" ( call :debug
+) else (
+if "%1"=="" ( call :release
+) else (
+  echo ERROR: Mode not defined: %1
+  echo Available modes: components, plugins, doublecmd, release, debug
+)))))))
+
+pause
+GOTO:EOF
+
+:components
+  call components\build.bat
+GOTO:EOF
+
+:plugins
+  call plugins\build.bat
+GOTO:EOF
+
+:release
+  call :components
+  call :plugins
+  call :doublecmd
+GOTO:EOF
+
+:debug
+  call :components
+  call :plugins
+
+  rem Build Double Commander
+  call :replace_old
+  lazbuild src\doublecmd.lpi --bm=debug %DC_ARCH%
+GOTO:EOF
+
+:doublecmd
+  rem Build Double Commander
+  call :replace_old
+  lazbuild src\doublecmd.lpi --bm=release %DC_ARCH%
+
+  rem Build Dwarf LineInfo Extractor
+  lazbuild tools\extractdwrflnfo.lpi
+
+  rem Extract debug line info
+  tools\extractdwrflnfo doublecmd.dbg
+GOTO:EOF
+
+:replace_old
+  del /Q doublecmd.exe.old
+  ren doublecmd.exe doublecmd.exe.old
+GOTO:EOF

+ 64 - 64
clean.bat

@@ -1,65 +1,65 @@
-@echo Clean up output directory
-@del /Q /S units\i386-win32-win32\*.*
-@del /Q /S units\x86_64-win64-win32\*.*
-@del /Q src\*.*~
-@del /Q src\*.~*
-@del /Q doublecmd.dbg
-@del /Q doublecmd.zdli
-@del /Q doublecmd*.exe
-@del /Q doublecmd*.old
-
-@echo Remove generated help files
-@del /Q doc\en\dev-help\*.*
-
-@echo Clean up tools output directories
-@del /Q /S tools\lib\*.*
-@del /Q tools\extractdwrflnfo.exe
-
-@echo Clean up plugins output directories
-@del /Q /S plugins\*.dsx
-@del /Q /S plugins\*.w?x
-
-@del /Q /S plugins\dsx\DSXLocate\lib\*.*
-
-@del /Q /S plugins\wcx\cpio\lib\*.*
-@del /Q /S plugins\wcx\deb\lib\*.*
-@del /Q /S plugins\wcx\lzma\lib\*.*
-@del /Q /S plugins\wcx\rpm\lib\*.*
-@del /Q /S plugins\wcx\sevenzip\lib\*.*
-@del /Q /S plugins\wcx\torrent\lib\*.*
-@del /Q /S plugins\wcx\unbz2\lib\*.*
-@del /Q /S plugins\wcx\unrar\lib\*.*
-@del /Q /S plugins\wcx\zip\lib\*.*
-
-@del /Q /S plugins\wdx\deb_wdx\lib\*.*
-@del /Q /S plugins\wdx\rpm_wdx\lib\*.*
-@del /Q /S plugins\wdx\svn_wdx\lib\*.*
-@del /Q /S plugins\wdx\xpi_wdx\lib\*.*
-@del /Q /S plugins\wdx\audioinfo\lib\*.*
-
-@del /Q /S plugins\wfx\ftp\lib\*.*
-@del /Q /S plugins\wfx\gvfs\lib\*.*
-@del /Q /S plugins\wfx\samba\lib\*.*
-@del /Q /S plugins\wfx\sample\lib\*.*
-
-@del /Q /S plugins\wlx\preview\lib\*.*
-@del /Q /S plugins\wlx\simplewlx\lib\*.*
-@del /Q /S plugins\wlx\WlxMplayer\lib\*.*
-
-@echo Remove backup files
-@del /Q /S plugins\*.*~
-@del /Q /S plugins\*.bak
-
-@echo Clean up components output directories
-
-@del /Q /S components\chsdet\lib\*.*
-@del /Q /S components\CmdLine\lib\*.*
-@del /Q /S components\dcpcrypt\lib\*.*
-@del /Q /S components\doublecmd\lib\*.*
-@del /Q /S components\gifanim\lib\*.*
-@del /Q /S components\KASToolBar\lib\*.*
-@del /Q /S components\multithreadprocs\lib\*.*
-@del /Q /S components\viewer\lib\*.*
-@del /Q /S components\synunihighlighter\lib\*.*
-
+@echo Clean up output directory
+@del /Q /S units\i386-win32-win32\*.*
+@del /Q /S units\x86_64-win64-win32\*.*
+@del /Q src\*.*~
+@del /Q src\*.~*
+@del /Q doublecmd.dbg
+@del /Q doublecmd.zdli
+@del /Q doublecmd*.exe
+@del /Q doublecmd*.old
+
+@echo Remove generated help files
+@del /Q doc\en\dev-help\*.*
+
+@echo Clean up tools output directories
+@del /Q /S tools\lib\*.*
+@del /Q tools\extractdwrflnfo.exe
+
+@echo Clean up plugins output directories
+@del /Q /S plugins\*.dsx
+@del /Q /S plugins\*.w?x
+
+@del /Q /S plugins\dsx\DSXLocate\lib\*.*
+
+@del /Q /S plugins\wcx\cpio\lib\*.*
+@del /Q /S plugins\wcx\deb\lib\*.*
+@del /Q /S plugins\wcx\lzma\lib\*.*
+@del /Q /S plugins\wcx\rpm\lib\*.*
+@del /Q /S plugins\wcx\sevenzip\lib\*.*
+@del /Q /S plugins\wcx\torrent\lib\*.*
+@del /Q /S plugins\wcx\unbz2\lib\*.*
+@del /Q /S plugins\wcx\unrar\lib\*.*
+@del /Q /S plugins\wcx\zip\lib\*.*
+
+@del /Q /S plugins\wdx\deb_wdx\lib\*.*
+@del /Q /S plugins\wdx\rpm_wdx\lib\*.*
+@del /Q /S plugins\wdx\svn_wdx\lib\*.*
+@del /Q /S plugins\wdx\xpi_wdx\lib\*.*
+@del /Q /S plugins\wdx\audioinfo\lib\*.*
+
+@del /Q /S plugins\wfx\ftp\lib\*.*
+@del /Q /S plugins\wfx\gvfs\lib\*.*
+@del /Q /S plugins\wfx\samba\lib\*.*
+@del /Q /S plugins\wfx\sample\lib\*.*
+
+@del /Q /S plugins\wlx\preview\lib\*.*
+@del /Q /S plugins\wlx\simplewlx\lib\*.*
+@del /Q /S plugins\wlx\WlxMplayer\lib\*.*
+
+@echo Remove backup files
+@del /Q /S plugins\*.*~
+@del /Q /S plugins\*.bak
+
+@echo Clean up components output directories
+
+@del /Q /S components\chsdet\lib\*.*
+@del /Q /S components\CmdLine\lib\*.*
+@del /Q /S components\dcpcrypt\lib\*.*
+@del /Q /S components\doublecmd\lib\*.*
+@del /Q /S components\gifanim\lib\*.*
+@del /Q /S components\KASToolBar\lib\*.*
+@del /Q /S components\multithreadprocs\lib\*.*
+@del /Q /S components\viewer\lib\*.*
+@del /Q /S components\synunihighlighter\lib\*.*
+
 @echo Done.

+ 18 - 18
components/build.bat

@@ -1,18 +1,18 @@
-@echo off
-
-rem Compiling components
-
-rem Do not execute this script directly.
-rem This script is called from ..\build.bat.
-
-pushd components
-lazbuild chsdet\chsdet.lpk %DC_ARCH%
-lazbuild CmdLine\cmdbox.lpk %DC_ARCH%
-lazbuild multithreadprocs\multithreadprocslaz.lpk %DC_ARCH%
-lazbuild dcpcrypt\dcpcrypt.lpk %DC_ARCH%
-lazbuild doublecmd\doublecmd_common.lpk %DC_ARCH%
-lazbuild KASToolBar\kascomp.lpk %DC_ARCH%
-lazbuild viewer\viewerpackage.lpk %DC_ARCH%
-lazbuild gifanim\pkg_gifanim.lpk %DC_ARCH%
-lazbuild synunihighlighter\synuni.lpk %DC_ARCH%
-popd
+@echo off
+
+rem Compiling components
+
+rem Do not execute this script directly.
+rem This script is called from ..\build.bat.
+
+pushd components
+lazbuild chsdet\chsdet.lpk %DC_ARCH%
+lazbuild CmdLine\cmdbox.lpk %DC_ARCH%
+lazbuild multithreadprocs\multithreadprocslaz.lpk %DC_ARCH%
+lazbuild dcpcrypt\dcpcrypt.lpk %DC_ARCH%
+lazbuild doublecmd\doublecmd_common.lpk %DC_ARCH%
+lazbuild KASToolBar\kascomp.lpk %DC_ARCH%
+lazbuild viewer\viewerpackage.lpk %DC_ARCH%
+lazbuild gifanim\pkg_gifanim.lpk %DC_ARCH%
+lazbuild synunihighlighter\synuni.lpk %DC_ARCH%
+popd

+ 1 - 1
docgen.bat

@@ -1,2 +1,2 @@
-REM http://pasdoc.sourceforge.net
+REM http://pasdoc.sourceforge.net
 pasdoc --marker en --output doc\en\dev-help --define MSWINDOWS --source units-doc-win.txt

+ 79 - 79
install/create_packages.bat

@@ -1,79 +1,79 @@
-
-rem Set Double Commander version
-set DC_VER=1.0.0
-
-rem Path to subversion
-set SVN_EXE="c:\Program Files\SlikSvn\bin\svn.exe"
-
-rem Path to Inno Setup compiler
-set ISCC_EXE="c:\Program Files\Inno Setup 5\ISCC.exe"
-
-rem The new package will be created from here
-set BUILD_PACK_DIR=%TEMP%\doublecmd-%DATE: =%
-
-rem The new package will be saved here
-set PACK_DIR=%CD%\windows\release
-
-rem Create temp dir for building
-set BUILD_DC_TMP_DIR=%TEMP%\doublecmd-%DC_VER%
-rm -rf %BUILD_DC_TMP_DIR%
-%SVN_EXE% export ..\ %BUILD_DC_TMP_DIR%
-
-rem Save revision number
-mkdir %BUILD_DC_TMP_DIR%\.svn
-copy ..\.svn\entries %BUILD_DC_TMP_DIR%\.svn\
-
-rem Prepare package build dir
-rm -rf %BUILD_PACK_DIR%
-mkdir %BUILD_PACK_DIR%
-mkdir %BUILD_PACK_DIR%\release
-
-rem Copy needed files
-copy windows\doublecmd.iss %BUILD_PACK_DIR%\
-copy windows\portable.diff %BUILD_PACK_DIR%\
-
-rem Get processor architecture
-if "%CPU_TARGET%" == "" (
-  if "%PROCESSOR_ARCHITECTURE%" == "x86" (
-    set CPU_TARGET=i386
-    set OS_TARGET=win32
-  ) else if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
-    set CPU_TARGET=x86_64
-    set OS_TARGET=win64
-  )
-)
-
-rem Copy libraries
-copy windows\lib\%CPU_TARGET%\*.dll    %BUILD_DC_TMP_DIR%\
-
-cd /D %BUILD_DC_TMP_DIR%
-
-rem Build all components of Double Commander
-call build.bat release
-
-rem Prepare install files
-call %BUILD_DC_TMP_DIR%\install\windows\install.bat
-
-cd /D %BUILD_PACK_DIR%
-rem Create *.exe package
-%ISCC_EXE% /F"doublecmd-%DC_VER%.%CPU_TARGET%-%OS_TARGET%" doublecmd.iss
-
-rem Move created package
-move release\*.exe %PACK_DIR%
-
-rem Create *.zip package
-copy NUL doublecmd\doublecmd.inf
-zip -9 -Dr %PACK_DIR%\doublecmd-%DC_VER%.%CPU_TARGET%-%OS_TARGET%.zip doublecmd 
-
-rem Create help packages
-cd /D %BUILD_DC_TMP_DIR%
-rem Copy help files
-call %BUILD_DC_TMP_DIR%\install\windows\install-help.bat
-rem Create help package for each language
-cd %BUILD_PACK_DIR%\doublecmd
-for /D %%f in (doc\*) do zip -9 -Dr %PACK_DIR%\doublecmd-help-%%~nf-%DC_VER%.noarch.zip %%f
-
-rem Clean temp directories
-cd \
-rm -rf %BUILD_DC_TMP_DIR%
-rm -rf %BUILD_PACK_DIR%
+
+rem Set Double Commander version
+set DC_VER=1.0.0
+
+rem Path to subversion
+set SVN_EXE="c:\Program Files\SlikSvn\bin\svn.exe"
+
+rem Path to Inno Setup compiler
+set ISCC_EXE="c:\Program Files\Inno Setup 5\ISCC.exe"
+
+rem The new package will be created from here
+set BUILD_PACK_DIR=%TEMP%\doublecmd-%DATE: =%
+
+rem The new package will be saved here
+set PACK_DIR=%CD%\windows\release
+
+rem Create temp dir for building
+set BUILD_DC_TMP_DIR=%TEMP%\doublecmd-%DC_VER%
+rm -rf %BUILD_DC_TMP_DIR%
+%SVN_EXE% export ..\ %BUILD_DC_TMP_DIR%
+
+rem Save revision number
+mkdir %BUILD_DC_TMP_DIR%\.svn
+copy ..\.svn\entries %BUILD_DC_TMP_DIR%\.svn\
+
+rem Prepare package build dir
+rm -rf %BUILD_PACK_DIR%
+mkdir %BUILD_PACK_DIR%
+mkdir %BUILD_PACK_DIR%\release
+
+rem Copy needed files
+copy windows\doublecmd.iss %BUILD_PACK_DIR%\
+copy windows\portable.diff %BUILD_PACK_DIR%\
+
+rem Get processor architecture
+if "%CPU_TARGET%" == "" (
+  if "%PROCESSOR_ARCHITECTURE%" == "x86" (
+    set CPU_TARGET=i386
+    set OS_TARGET=win32
+  ) else if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
+    set CPU_TARGET=x86_64
+    set OS_TARGET=win64
+  )
+)
+
+rem Copy libraries
+copy windows\lib\%CPU_TARGET%\*.dll    %BUILD_DC_TMP_DIR%\
+
+cd /D %BUILD_DC_TMP_DIR%
+
+rem Build all components of Double Commander
+call build.bat release
+
+rem Prepare install files
+call %BUILD_DC_TMP_DIR%\install\windows\install.bat
+
+cd /D %BUILD_PACK_DIR%
+rem Create *.exe package
+%ISCC_EXE% /F"doublecmd-%DC_VER%.%CPU_TARGET%-%OS_TARGET%" doublecmd.iss
+
+rem Move created package
+move release\*.exe %PACK_DIR%
+
+rem Create *.zip package
+copy NUL doublecmd\doublecmd.inf
+zip -9 -Dr %PACK_DIR%\doublecmd-%DC_VER%.%CPU_TARGET%-%OS_TARGET%.zip doublecmd 
+
+rem Create help packages
+cd /D %BUILD_DC_TMP_DIR%
+rem Copy help files
+call %BUILD_DC_TMP_DIR%\install\windows\install-help.bat
+rem Create help package for each language
+cd %BUILD_PACK_DIR%\doublecmd
+for /D %%f in (doc\*) do zip -9 -Dr %PACK_DIR%\doublecmd-help-%%~nf-%DC_VER%.noarch.zip %%f
+
+rem Clean temp directories
+cd \
+rm -rf %BUILD_DC_TMP_DIR%
+rm -rf %BUILD_PACK_DIR%

+ 65 - 65
install/windows/convert-zip-msi.bat

@@ -1,65 +1,65 @@
-@echo off
-
-rem This script converts portable *.zip package to *.msi package
-
-rem Check command arguments
-if "%1" == "" (
-  echo.
-  echo Syntax:
-  echo.
-  echo   %~nx0 ^<Full path to portable .zip package^>
-  goto :eof
-)
-
-rem Path to Windows Installer XML (WiX) toolset
-set PATH=%PATH%;"C:\Program Files (x86)\WiX Toolset v3.11\bin"
-
-rem The new package will be created from here
-set BUILD_PACK_DIR=%TEMP%\doublecmd-%DATE: =%
-
-rem The new package will be saved here
-set PACK_DIR=%~dp0/release
-
-rem Determine package file name
-for /f %%i in ("%1") do set PACKAGE=%%~ni
-
-rem Get package version and architecture
-for /f "tokens=1,2,3,4,5 delims=-." %%a in ("%PACKAGE%") do (
-  set DC_VER=%%b.%%c.%%d
-  set CPU_TARGET=%%e
-)
-
-rem Prepare needed variables
-if "%CPU_TARGET%" == "i386" (
-  set CPU_TARGET=x86
-  set PF=ProgramFilesFolder
-) else if "%CPU_TARGET%" == "x86_64" (
-  set CPU_TARGET=x64
-  set PF=ProgramFiles64Folder
-)
-
-rem Prepare package build dir
-mkdir %BUILD_PACK_DIR%
-
-rem Extract archive
-unzip %1 -d %BUILD_PACK_DIR%
-
-rem Copy needed files
-copy license.rtf             %BUILD_PACK_DIR%\
-copy doublecmd.wxs           %BUILD_PACK_DIR%\
-copy ..\..\src\doublecmd.ico %BUILD_PACK_DIR%\
-
-pushd %BUILD_PACK_DIR%
-
-del /Q doublecmd\doublecmd.inf
-move doublecmd "Double Commander"
-heat dir "Double Commander" -ag -cg HeatGroup -dr %PF% -var var.SourcePath -o include.wxs
-candle -arch %CPU_TARGET% -dProductVersion=%DC_VER% -dSourcePath="Double Commander" -dProgramFiles=%PF% doublecmd.wxs include.wxs
-light -ext WixUIExtension -cultures:en-us include.wixobj doublecmd.wixobj -o %PACKAGE%.msi
-
-rem Move created package
-move %PACKAGE%.msi %PACK_DIR%/
-
-rem Clean temp directories
-popd
-rmdir /S /Q %BUILD_PACK_DIR%
+@echo off
+
+rem This script converts portable *.zip package to *.msi package
+
+rem Check command arguments
+if "%1" == "" (
+  echo.
+  echo Syntax:
+  echo.
+  echo   %~nx0 ^<Full path to portable .zip package^>
+  goto :eof
+)
+
+rem Path to Windows Installer XML (WiX) toolset
+set PATH=%PATH%;"C:\Program Files (x86)\WiX Toolset v3.11\bin"
+
+rem The new package will be created from here
+set BUILD_PACK_DIR=%TEMP%\doublecmd-%DATE: =%
+
+rem The new package will be saved here
+set PACK_DIR=%~dp0/release
+
+rem Determine package file name
+for /f %%i in ("%1") do set PACKAGE=%%~ni
+
+rem Get package version and architecture
+for /f "tokens=1,2,3,4,5 delims=-." %%a in ("%PACKAGE%") do (
+  set DC_VER=%%b.%%c.%%d
+  set CPU_TARGET=%%e
+)
+
+rem Prepare needed variables
+if "%CPU_TARGET%" == "i386" (
+  set CPU_TARGET=x86
+  set PF=ProgramFilesFolder
+) else if "%CPU_TARGET%" == "x86_64" (
+  set CPU_TARGET=x64
+  set PF=ProgramFiles64Folder
+)
+
+rem Prepare package build dir
+mkdir %BUILD_PACK_DIR%
+
+rem Extract archive
+unzip %1 -d %BUILD_PACK_DIR%
+
+rem Copy needed files
+copy license.rtf             %BUILD_PACK_DIR%\
+copy doublecmd.wxs           %BUILD_PACK_DIR%\
+copy ..\..\src\doublecmd.ico %BUILD_PACK_DIR%\
+
+pushd %BUILD_PACK_DIR%
+
+del /Q doublecmd\doublecmd.inf
+move doublecmd "Double Commander"
+heat dir "Double Commander" -ag -cg HeatGroup -dr %PF% -var var.SourcePath -o include.wxs
+candle -arch %CPU_TARGET% -dProductVersion=%DC_VER% -dSourcePath="Double Commander" -dProgramFiles=%PF% doublecmd.wxs include.wxs
+light -ext WixUIExtension -cultures:en-us include.wixobj doublecmd.wixobj -o %PACKAGE%.msi
+
+rem Move created package
+move %PACKAGE%.msi %PACK_DIR%/
+
+rem Clean temp directories
+popd
+rmdir /S /Q %BUILD_PACK_DIR%

+ 11 - 11
install/windows/install-help.bat

@@ -1,12 +1,12 @@
-rem This script run from create_packages.bat
-rem If you run it direct, set up %BUILD_PACK_DIR% first
-
-set DC_HELP_INSTALL_DIR=%BUILD_PACK_DIR%\doublecmd\doc
-
-rem Clean help directory
-rm -rf %DC_HELP_INSTALL_DIR%\
-
-rem Copy Russian help files
-xcopy /E doc\ru %DC_HELP_INSTALL_DIR%\ru\
-rem Copy Ukrainian help files
+rem This script run from create_packages.bat
+rem If you run it direct, set up %BUILD_PACK_DIR% first
+
+set DC_HELP_INSTALL_DIR=%BUILD_PACK_DIR%\doublecmd\doc
+
+rem Clean help directory
+rm -rf %DC_HELP_INSTALL_DIR%\
+
+rem Copy Russian help files
+xcopy /E doc\ru %DC_HELP_INSTALL_DIR%\ru\
+rem Copy Ukrainian help files
 xcopy /E doc\uk %DC_HELP_INSTALL_DIR%\uk\

+ 64 - 64
install/windows/install.bat

@@ -1,64 +1,64 @@
-rem This script run from create_packages.bat
-rem If you run it direct, set up %BUILD_PACK_DIR% first
-
-rem Prepare all installation files
-
-set DC_INSTALL_DIR=%BUILD_PACK_DIR%\doublecmd
-mkdir  %DC_INSTALL_DIR%
-
-mkdir  %DC_INSTALL_DIR%\plugins
-rem WCX plugins directories
-mkdir  %DC_INSTALL_DIR%\plugins\wcx
-mkdir  %DC_INSTALL_DIR%\plugins\wcx\rpm
-mkdir  %DC_INSTALL_DIR%\plugins\wcx\sevenzip
-mkdir  %DC_INSTALL_DIR%\plugins\wcx\unrar
-mkdir  %DC_INSTALL_DIR%\plugins\wcx\zip
-rem WDX plugins directories
-mkdir  %DC_INSTALL_DIR%\plugins\wdx
-mkdir  %DC_INSTALL_DIR%\plugins\wdx\scripts
-mkdir  %DC_INSTALL_DIR%\plugins\wdx\rpm_wdx
-mkdir  %DC_INSTALL_DIR%\plugins\wdx\deb_wdx
-mkdir  %DC_INSTALL_DIR%\plugins\wdx\audioinfo
-rem WFX plugins directories
-mkdir  %DC_INSTALL_DIR%\plugins\wfx
-mkdir  %DC_INSTALL_DIR%\plugins\wfx\ftp
-rem WLX plugins directories
-mkdir  %DC_INSTALL_DIR%\plugins\wlx
-mkdir  %DC_INSTALL_DIR%\plugins\wlx\preview
-
-mkdir  %DC_INSTALL_DIR%\doc
-rem Copy directories
-xcopy /E language     %DC_INSTALL_DIR%\language\
-xcopy /E pixmaps      %DC_INSTALL_DIR%\pixmaps\
-xcopy /E highlighters %DC_INSTALL_DIR%\highlighters\
-rem Copy files
-copy doc\*.txt                      %DC_INSTALL_DIR%\doc\
-copy doublecmd.exe                  %DC_INSTALL_DIR%\
-copy doublecmd.help                 %DC_INSTALL_DIR%\
-copy doublecmd.zdli                 %DC_INSTALL_DIR%\
-copy doublecmd.ext.example          %DC_INSTALL_DIR%\
-copy pixmaps.txt                    %DC_INSTALL_DIR%\
-copy multiarc.ini                   %DC_INSTALL_DIR%\
-copy pinyin.tbl                     %DC_INSTALL_DIR%\
-rem Copy libraries
-copy *.dll                          %DC_INSTALL_DIR%\
-
-rem copy plugins
-rem WCX
-copy  plugins\wcx\rpm\rpm.wcx             %DC_INSTALL_DIR%\plugins\wcx\rpm\
-copy  plugins\wcx\sevenzip\sevenzip.wcx   %DC_INSTALL_DIR%\plugins\wcx\sevenzip\
-copy  plugins\wcx\unrar\unrar.wcx         %DC_INSTALL_DIR%\plugins\wcx\unrar\
-xcopy /E plugins\wcx\unrar\language       %DC_INSTALL_DIR%\plugins\wcx\unrar\language\
-copy  plugins\wcx\zip\zip.wcx             %DC_INSTALL_DIR%\plugins\wcx\zip\
-xcopy /E plugins\wcx\zip\language         %DC_INSTALL_DIR%\plugins\wcx\zip\language\
-rem WDX
-copy  plugins\wdx\rpm_wdx\rpm_wdx.wdx     %DC_INSTALL_DIR%\plugins\wdx\rpm_wdx\
-copy  plugins\wdx\deb_wdx\deb_wdx.wdx     %DC_INSTALL_DIR%\plugins\wdx\deb_wdx\
-copy  plugins\wdx\scripts\*               %DC_INSTALL_DIR%\plugins\wdx\scripts\
-copy  plugins\wdx\audioinfo\audioinfo.wdx %DC_INSTALL_DIR%\plugins\wdx\audioinfo\
-copy  plugins\wdx\audioinfo\audioinfo.lng %DC_INSTALL_DIR%\plugins\wdx\audioinfo\
-rem WFX
-copy  plugins\wfx\ftp\ftp.wfx             %DC_INSTALL_DIR%\plugins\wfx\ftp\
-xcopy /E plugins\wfx\ftp\language         %DC_INSTALL_DIR%\plugins\wfx\ftp\language\
-rem WLX
-copy  plugins\wlx\preview\preview.wlx     %DC_INSTALL_DIR%\plugins\wlx\preview\
+rem This script run from create_packages.bat
+rem If you run it direct, set up %BUILD_PACK_DIR% first
+
+rem Prepare all installation files
+
+set DC_INSTALL_DIR=%BUILD_PACK_DIR%\doublecmd
+mkdir  %DC_INSTALL_DIR%
+
+mkdir  %DC_INSTALL_DIR%\plugins
+rem WCX plugins directories
+mkdir  %DC_INSTALL_DIR%\plugins\wcx
+mkdir  %DC_INSTALL_DIR%\plugins\wcx\rpm
+mkdir  %DC_INSTALL_DIR%\plugins\wcx\sevenzip
+mkdir  %DC_INSTALL_DIR%\plugins\wcx\unrar
+mkdir  %DC_INSTALL_DIR%\plugins\wcx\zip
+rem WDX plugins directories
+mkdir  %DC_INSTALL_DIR%\plugins\wdx
+mkdir  %DC_INSTALL_DIR%\plugins\wdx\scripts
+mkdir  %DC_INSTALL_DIR%\plugins\wdx\rpm_wdx
+mkdir  %DC_INSTALL_DIR%\plugins\wdx\deb_wdx
+mkdir  %DC_INSTALL_DIR%\plugins\wdx\audioinfo
+rem WFX plugins directories
+mkdir  %DC_INSTALL_DIR%\plugins\wfx
+mkdir  %DC_INSTALL_DIR%\plugins\wfx\ftp
+rem WLX plugins directories
+mkdir  %DC_INSTALL_DIR%\plugins\wlx
+mkdir  %DC_INSTALL_DIR%\plugins\wlx\preview
+
+mkdir  %DC_INSTALL_DIR%\doc
+rem Copy directories
+xcopy /E language     %DC_INSTALL_DIR%\language\
+xcopy /E pixmaps      %DC_INSTALL_DIR%\pixmaps\
+xcopy /E highlighters %DC_INSTALL_DIR%\highlighters\
+rem Copy files
+copy doc\*.txt                      %DC_INSTALL_DIR%\doc\
+copy doublecmd.exe                  %DC_INSTALL_DIR%\
+copy doublecmd.help                 %DC_INSTALL_DIR%\
+copy doublecmd.zdli                 %DC_INSTALL_DIR%\
+copy doublecmd.ext.example          %DC_INSTALL_DIR%\
+copy pixmaps.txt                    %DC_INSTALL_DIR%\
+copy multiarc.ini                   %DC_INSTALL_DIR%\
+copy pinyin.tbl                     %DC_INSTALL_DIR%\
+rem Copy libraries
+copy *.dll                          %DC_INSTALL_DIR%\
+
+rem copy plugins
+rem WCX
+copy  plugins\wcx\rpm\rpm.wcx             %DC_INSTALL_DIR%\plugins\wcx\rpm\
+copy  plugins\wcx\sevenzip\sevenzip.wcx   %DC_INSTALL_DIR%\plugins\wcx\sevenzip\
+copy  plugins\wcx\unrar\unrar.wcx         %DC_INSTALL_DIR%\plugins\wcx\unrar\
+xcopy /E plugins\wcx\unrar\language       %DC_INSTALL_DIR%\plugins\wcx\unrar\language\
+copy  plugins\wcx\zip\zip.wcx             %DC_INSTALL_DIR%\plugins\wcx\zip\
+xcopy /E plugins\wcx\zip\language         %DC_INSTALL_DIR%\plugins\wcx\zip\language\
+rem WDX
+copy  plugins\wdx\rpm_wdx\rpm_wdx.wdx     %DC_INSTALL_DIR%\plugins\wdx\rpm_wdx\
+copy  plugins\wdx\deb_wdx\deb_wdx.wdx     %DC_INSTALL_DIR%\plugins\wdx\deb_wdx\
+copy  plugins\wdx\scripts\*               %DC_INSTALL_DIR%\plugins\wdx\scripts\
+copy  plugins\wdx\audioinfo\audioinfo.wdx %DC_INSTALL_DIR%\plugins\wdx\audioinfo\
+copy  plugins\wdx\audioinfo\audioinfo.lng %DC_INSTALL_DIR%\plugins\wdx\audioinfo\
+rem WFX
+copy  plugins\wfx\ftp\ftp.wfx             %DC_INSTALL_DIR%\plugins\wfx\ftp\
+xcopy /E plugins\wfx\ftp\language         %DC_INSTALL_DIR%\plugins\wfx\ftp\language\
+rem WLX
+copy  plugins\wlx\preview\preview.wlx     %DC_INSTALL_DIR%\plugins\wlx\preview\

+ 4 - 4
libraries/src/libpcre2/build.bat

@@ -1,4 +1,4 @@
-rem Build libpcre2 library
-
-cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=ON -DPCRE2_NEWLINE=CRLF
-mingw32-make
+rem Build libpcre2 library
+
+cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=ON -DPCRE2_NEWLINE=CRLF
+mingw32-make

+ 5 - 5
libraries/src/libssh2/build.bat

@@ -1,5 +1,5 @@
-rem Build libssh2 library
-
-mkdir release
-copy NUL release\version.inc
-make dll WITH_WINCNG=1 LDFLAGS+=" -static -shared"
+rem Build libssh2 library
+
+mkdir release
+copy NUL release\version.inc
+make dll WITH_WINCNG=1 LDFLAGS+=" -static -shared"

+ 31 - 31
plugins/build.bat

@@ -1,31 +1,31 @@
-@echo off
-
-rem Build all plugins
-
-rem Do not execute this script directly.
-rem This script is called from ..\build.bat.
-
-rem CD to plugins directory
-pushd plugins
-
-rem WCX plugins
-lazbuild wcx\deb\src\deb.lpi              %DC_ARCH%
-lazbuild wcx\rpm\src\rpm.lpi              %DC_ARCH%
-lazbuild wcx\sevenzip\src\sevenzipwcx.lpi %DC_ARCH%
-lazbuild wcx\unrar\src\unrar.lpi          %DC_ARCH%
-lazbuild wcx\zip\src\zip.lpi              %DC_ARCH%
-
-rem WDX plugins
-lazbuild wdx\rpm_wdx\src\rpm_wdx.lpi     %DC_ARCH%
-lazbuild wdx\deb_wdx\src\deb_wdx.lpi     %DC_ARCH%
-lazbuild wdx\xpi_wdx\src\xpi_wdx.lpi     %DC_ARCH%
-lazbuild wdx\audioinfo\src\AudioInfo.lpi %DC_ARCH%
-
-rem WFX plugins
-lazbuild wfx\ftp\src\ftp.lpi             %DC_ARCH%
-
-rem WLX plugins
-lazbuild wlx\preview\src\preview.lpi     %DC_ARCH%
-
-rem Return from plugins directory
-popd
+@echo off
+
+rem Build all plugins
+
+rem Do not execute this script directly.
+rem This script is called from ..\build.bat.
+
+rem CD to plugins directory
+pushd plugins
+
+rem WCX plugins
+lazbuild wcx\deb\src\deb.lpi              %DC_ARCH%
+lazbuild wcx\rpm\src\rpm.lpi              %DC_ARCH%
+lazbuild wcx\sevenzip\src\sevenzipwcx.lpi %DC_ARCH%
+lazbuild wcx\unrar\src\unrar.lpi          %DC_ARCH%
+lazbuild wcx\zip\src\zip.lpi              %DC_ARCH%
+
+rem WDX plugins
+lazbuild wdx\rpm_wdx\src\rpm_wdx.lpi     %DC_ARCH%
+lazbuild wdx\deb_wdx\src\deb_wdx.lpi     %DC_ARCH%
+lazbuild wdx\xpi_wdx\src\xpi_wdx.lpi     %DC_ARCH%
+lazbuild wdx\audioinfo\src\AudioInfo.lpi %DC_ARCH%
+
+rem WFX plugins
+lazbuild wfx\ftp\src\ftp.lpi             %DC_ARCH%
+
+rem WLX plugins
+lazbuild wlx\preview\src\preview.lpi     %DC_ARCH%
+
+rem Return from plugins directory
+popd

+ 41 - 41
plugins/wcx/sevenzip/build.bat

@@ -1,41 +1,41 @@
-@echo off
-
-set VERSION=19.12.21
-
-rem The next two line must be changed before run on your computer
-set lazpath=D:\Alexx\Prog\FreePascal\Lazarus
-
-set PATH=%lazpath%;%PATH%
-
-del /Q /S *.wcx*
-del /Q /S lib\*.*
-
-lazbuild.exe --cpu=x86_64 --os=win64 --bm=Release src\SevenZipWcx.lpi
-
-ren sevenzip.wcx sevenzip.wcx64
-
-del /Q /S lib\*.*
-
-lazbuild.exe --cpu=i386 --os=win32 --bm=Release src\SevenZipWcx.lpi
-
-del /Q /S lib\*.*
-
-rem Prepare archive
-
-del /Q /S release\*
-
-copy "C:\Program Files (x86)\7-Zip\7z.dll"  release\i386\
-copy "C:\Program Files\7-Zip\7z.dll"        release\x86_64\
-
-copy LICENSE.txt     release\
-copy pluginst.inf    release\
-copy README.txt      release\
-copy sevenzip.wcx    release\
-copy sevenzip.wcx64  release\
-
-del /Q sevenzip-*.zip
-pushd release
-"C:\Program Files\7-Zip\7z.exe" a ..\sevenzip-%VERSION%.zip .\*
-popd
-
-del /Q /S release\*
+@echo off
+
+set VERSION=19.12.21
+
+rem The next two line must be changed before run on your computer
+set lazpath=D:\Alexx\Prog\FreePascal\Lazarus
+
+set PATH=%lazpath%;%PATH%
+
+del /Q /S *.wcx*
+del /Q /S lib\*.*
+
+lazbuild.exe --cpu=x86_64 --os=win64 --bm=Release src\SevenZipWcx.lpi
+
+ren sevenzip.wcx sevenzip.wcx64
+
+del /Q /S lib\*.*
+
+lazbuild.exe --cpu=i386 --os=win32 --bm=Release src\SevenZipWcx.lpi
+
+del /Q /S lib\*.*
+
+rem Prepare archive
+
+del /Q /S release\*
+
+copy "C:\Program Files (x86)\7-Zip\7z.dll"  release\i386\
+copy "C:\Program Files\7-Zip\7z.dll"        release\x86_64\
+
+copy LICENSE.txt     release\
+copy pluginst.inf    release\
+copy README.txt      release\
+copy sevenzip.wcx    release\
+copy sevenzip.wcx64  release\
+
+del /Q sevenzip-*.zip
+pushd release
+"C:\Program Files\7-Zip\7z.exe" a ..\sevenzip-%VERSION%.zip .\*
+popd
+
+del /Q /S release\*