mirror of
https://github.com/doublecmd/doublecmd.git
synced 2026-06-21 09:58:13 +00:00
UPD: Create packages scripts
FIX: Some fixes for patch [ 2565485 ] Clipboard support
This commit is contained in:
parent
27d6d58128
commit
a4914b807f
6 changed files with 36 additions and 26 deletions
26
fmain.pas
26
fmain.pas
|
|
@ -1520,38 +1520,47 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
// Frees srcFileList.
|
||||
procedure TfrmMain.RunRenameThread(srcFileList: TFileList; sDestPath: String; sDestMask: String);
|
||||
var
|
||||
MT: TMoveThread;
|
||||
MT: TMoveThread = nil;
|
||||
begin
|
||||
try
|
||||
MT:= TMoveThread.Create(srcFileList);
|
||||
MT.sDstPath:= sDestPath;
|
||||
MT.sDstMask:= sDestMask;
|
||||
MT.Resume;
|
||||
MT.Resume; // srcFileList is freed when thread finishes
|
||||
except
|
||||
MT.Free;
|
||||
if MT <> nil then
|
||||
MT.Free // frees srcFileList
|
||||
else
|
||||
FreeAndNil(srcFileList);
|
||||
end;
|
||||
end;
|
||||
|
||||
// Frees srcFileList.
|
||||
procedure TfrmMain.RunCopyThread(srcFileList: TFileList;
|
||||
sDestPath: String; sDestMask: String;
|
||||
bDropReadOnlyFlag: Boolean);
|
||||
var
|
||||
CT: TCopyThread;
|
||||
CT: TCopyThread = nil;
|
||||
begin
|
||||
try
|
||||
CT:= TCopyThread.Create(srcFileList);
|
||||
CT.sDstPath:= sDestPath;
|
||||
CT.sDstMask:= sDestMask;
|
||||
CT.bDropReadOnlyFlag:= bDropReadOnlyFlag;
|
||||
CT.Resume;
|
||||
CT.Resume; // srcFileList is freed when thread finishes
|
||||
except
|
||||
CT.Free;
|
||||
if CT <> nil then
|
||||
CT.Free // frees srcFileList
|
||||
else
|
||||
FreeAndNil(srcFileList);
|
||||
end;
|
||||
end;
|
||||
|
||||
(* Used for drag&drop move from external application *)
|
||||
// Frees srcFileList automatically.
|
||||
procedure TfrmMain.RenameFile(srcFileList: TFileList; dstFramePanel: TFrameFilePanel);
|
||||
var
|
||||
sDestPath,
|
||||
|
|
@ -1589,6 +1598,7 @@ begin
|
|||
end;
|
||||
|
||||
(* Used for drag&drop copy from external application *)
|
||||
// Frees srcFileList automatically.
|
||||
procedure TfrmMain.CopyFile(srcFileList: TFileList; dstFramePanel: TFrameFilePanel);
|
||||
var
|
||||
sCopyQuest,
|
||||
|
|
@ -1712,7 +1722,7 @@ begin
|
|||
|
||||
RunRenameThread(fl, sDestPath, sDstMaskTemp);
|
||||
|
||||
finally
|
||||
except
|
||||
FreeAndNil(fl);
|
||||
end;
|
||||
end;
|
||||
|
|
@ -1832,7 +1842,7 @@ begin
|
|||
|
||||
RunCopyThread(fl, sDestPath, sDstMaskTemp, blDropReadOnlyFlag);
|
||||
|
||||
finally
|
||||
except
|
||||
FreeAndNil(fl);
|
||||
end;
|
||||
end;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ rem Set Double Commander version
|
|||
set DC_VER=0.4.0
|
||||
|
||||
rem Path to subversion
|
||||
set SVN_EXE="c:\Program Files\svn-win32-1.4.3\bin\svn.exe"
|
||||
set SVN_EXE="c:\Program Files\svn-win32-1.5.5\bin\svn.exe"
|
||||
|
||||
rem Path to Inno Setup compiler
|
||||
set ISCC_EXE="c:\Program Files\Inno Setup 5\ISCC.exe"
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@ cp -a language $DC_INSTALL_DIR/
|
|||
cp -a doc $DC_INSTALL_DIR/
|
||||
cp -a pixmaps $DC_INSTALL_DIR/
|
||||
# Copy files
|
||||
cp -a doublecmd $DC_INSTALL_DIR/
|
||||
cp -a doublecmd.ini $DC_INSTALL_DIR/
|
||||
cp -a doublecmd.ext $DC_INSTALL_DIR/
|
||||
cp -a editor.col $DC_INSTALL_DIR/
|
||||
cp -a twilight.col $DC_INSTALL_DIR/
|
||||
cp -a pixmaps.txt $DC_INSTALL_DIR/
|
||||
cp -a default.bar $DC_INSTALL_DIR/
|
||||
cp -a doublecmd $DC_INSTALL_DIR/
|
||||
cp -a doublecmd.ini $DC_INSTALL_DIR/
|
||||
cp -a doublecmd.ext.example $DC_INSTALL_DIR/
|
||||
cp -a editor.col $DC_INSTALL_DIR/
|
||||
cp -a twilight.col $DC_INSTALL_DIR/
|
||||
cp -a pixmaps.txt $DC_INSTALL_DIR/
|
||||
cp -a default.bar $DC_INSTALL_DIR/
|
||||
|
||||
# copy plugins
|
||||
# WCX
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
[Setup]
|
||||
AppName=Double Commander
|
||||
AppVerName=Double Commander 0.3.5 alpha
|
||||
AppVerName=Double Commander 0.4 beta
|
||||
AppPublisherURL=http://doublecmd.sourceforge.net
|
||||
AppSupportURL=http://doublecmd.sourceforge.net
|
||||
AppUpdatesURL=http://doublecmd.sourceforge.net
|
||||
|
|
@ -12,7 +12,7 @@ DefaultGroupName=Double Commander
|
|||
AllowNoIcons=yes
|
||||
LicenseFile=doublecmd\doc\COPYING
|
||||
OutputDir=release
|
||||
OutputBaseFilename=doublecmd-0.3a.i386-win32
|
||||
OutputBaseFilename=doublecmd-0.4.0.i386-win32
|
||||
Compression=lzma
|
||||
SolidCompression=yes
|
||||
|
||||
|
|
|
|||
|
|
@ -24,15 +24,15 @@ xcopy /E language %DC_INSTALL_DIR%\language\
|
|||
xcopy /E doc %DC_INSTALL_DIR%\doc\
|
||||
xcopy /E pixmaps %DC_INSTALL_DIR%\pixmaps\
|
||||
rem Copy files
|
||||
copy doublecmd.exe %DC_INSTALL_DIR%\
|
||||
copy doublecmd.ini %DC_INSTALL_DIR%\
|
||||
copy doublecmd.ext %DC_INSTALL_DIR%\
|
||||
copy editor.col %DC_INSTALL_DIR%\
|
||||
copy twilight.col %DC_INSTALL_DIR%\
|
||||
copy pixmaps.txt %DC_INSTALL_DIR%\
|
||||
copy default.bar %DC_INSTALL_DIR%\
|
||||
copy doublecmd.exe %DC_INSTALL_DIR%\
|
||||
copy doublecmd.ini %DC_INSTALL_DIR%\
|
||||
copy doublecmd.ext.example %DC_INSTALL_DIR%\
|
||||
copy editor.col %DC_INSTALL_DIR%\
|
||||
copy twilight.col %DC_INSTALL_DIR%\
|
||||
copy pixmaps.txt %DC_INSTALL_DIR%\
|
||||
copy default.bar %DC_INSTALL_DIR%\
|
||||
rem Copy libraries
|
||||
copy *.dll %DC_INSTALL_DIR%\
|
||||
copy *.dll %DC_INSTALL_DIR%\
|
||||
|
||||
rem copy plugins
|
||||
rem WCX
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue