UPD: Enable zip plugin under Mac OS X

This commit is contained in:
Alexander Koblov 2012-06-24 19:55:48 +00:00
commit 82d690934c
3 changed files with 2 additions and 8 deletions

View file

@ -36,9 +36,6 @@ fi
# Set minimal Mac OS X target version
export MACOSX_DEPLOYMENT_TARGET=10.5
# Copy 7-Zip executable
cp -a darwin/lib/$CPU_TARGET/7za $BUILD_DC_TMP_DIR/
# Copy libraries
cp -a darwin/lib/$CPU_TARGET/*.dylib $BUILD_DC_TMP_DIR/
cp -a darwin/lib/$CPU_TARGET/$lcl/*.dylib $BUILD_DC_TMP_DIR/
@ -52,8 +49,6 @@ cd $BUILD_DC_TMP_DIR
mkdir -p $BUILD_PACK_DIR
install/darwin/install.sh $BUILD_PACK_DIR
cd $BUILD_PACK_DIR
sed -e 's/Archiver=7za/Archiver=%commander_path%\/7za/' -i '' doublecmd.app/Contents/MacOS/multiarc.ini
sed -e 's/Extension=7z/Extension=7z,zip,tar,gz,bz2,tgz,tbz/' -i '' doublecmd.app/Contents/MacOS/multiarc.ini
mv doublecmd.app 'Double Commander.app'
hdiutil create -anyowners -volname "Double Commander" -imagekey zlib-level=9 -format UDZO -srcfolder 'Double Commander.app' $PACK_DIR/doublecmd-$DC_VER-$DC_REVISION.$lcl.$CPU_TARGET.dmg

View file

@ -19,6 +19,7 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb
mkdir -p $DC_INSTALL_DIR/plugins/wcx/lzma
mkdir -p $DC_INSTALL_DIR/plugins/wcx/rpm
mkdir -p $DC_INSTALL_DIR/plugins/wcx/unrar
mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip
# WDX plugins directories
mkdir -p $DC_INSTALL_DIR/plugins/wdx
mkdir -p $DC_INSTALL_DIR/plugins/wdx/scripts
@ -36,7 +37,6 @@ cp -a install/darwin/doublecmd.xml $DC_INSTALL_DIR/
cp -a doublecmd.ext.example $DC_INSTALL_DIR/
cp -a pixmaps.txt $DC_INSTALL_DIR/
cp -a multiarc.ini $DC_INSTALL_DIR/
cp -a 7za $DC_INSTALL_DIR/
# Copy plugins
@ -46,6 +46,7 @@ install -m 644 plugins/wcx/deb/lib/deb.wcx $DC_INSTALL_DIR/plugins/wcx/
install -m 644 plugins/wcx/lzma/lib/lzma.wcx $DC_INSTALL_DIR/plugins/wcx/lzma/
install -m 644 plugins/wcx/rpm/lib/rpm.wcx $DC_INSTALL_DIR/plugins/wcx/rpm/
install -m 644 plugins/wcx/unrar/lib/unrar.wcx $DC_INSTALL_DIR/plugins/wcx/unrar/
install -m 644 plugins/wcx/zip/lib/zip.wcx $DC_INSTALL_DIR/plugins/wcx/zip/
# WDX
install -m 644 plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx $DC_INSTALL_DIR/plugins/wdx/rpm_wdx/
install -m 644 plugins/wdx/deb_wdx/lib/deb_wdx.wdx $DC_INSTALL_DIR/plugins/wdx/deb_wdx/

View file

@ -22,7 +22,6 @@ begin
// Wcx plugins
Folder:= '%commander_path%' + PathDelim + 'plugins' + PathDelim + 'wcx' + PathDelim;
{$IF NOT DEFINED(DARWIN)}
I:= gWCXPlugins.IndexOfName('zip');
if I < 0 then
gWCXPlugins.Add('zip', 607, Folder + 'zip' + PathDelim + 'zip.wcx')
@ -62,7 +61,6 @@ begin
gWCXPlugins.Add('tgz', 95, Folder + 'zip' + PathDelim + 'zip.wcx')
else
gWCXPlugins.Flags[I]:= 95;
{$ENDIF}
I:= gWCXPlugins.IndexOfName('lzma');
if I < 0 then