UPD: Use DWARF debug info under Mac OS X (like under other OS)

build.sh

@@ -48,10 +48,13 @@ build_beta()
   
   # Extract debug line info
   chmod a+x tools/extractdwrflnfo
+  if [ -f doublecmd.dSYM/Contents/Resources/DWARF/doublecmd ]; then
+    mv -f doublecmd.dSYM/Contents/Resources/DWARF/doublecmd $(pwd)/doublecmd.dbg
+  fi
   tools/extractdwrflnfo doublecmd.dbg
   
   # Strip debug info
-  strip --strip-all doublecmd
+  strip doublecmd
 }
 
 build_all()

clean.sh

@@ -22,13 +22,17 @@ find . -iname '*.o' -delete
 find plugins -iname '*.w?x' -delete
 find plugins -iname '*.dsx' -delete
 find plugins -iname '*.or'  -delete
-rm -f src/doublecmd.res doublecmd doublecmd.zdli doublecmd.dbg
+rm -f src/doublecmd.res doublecmd
 rm -f tools/extractdwrflnfo
 rm -f plugins/wcx/zip/lib/ZipConfDlg.lfm
 rm -f plugins/wcx/zip/lib/abresstring.rst
 rm -f plugins/wfx/ftp/lib/FtpConfDlg.lfm
 rm -f plugins/wfx/samba/lib/smbauthdlg.lfm
 
+# Remove debug files
+rm -f  doublecmd.zdli doublecmd.dbg
+rm -rf doublecmd.dSYM
+
 # Restore dcrevision.inc
 echo "// Created by Svn2RevisionInc\r" >  src/dcrevision.inc
 echo "const dcRevision = 'Unknown';\r" >> src/dcrevision.inc

install/create_packages.mac

@@ -43,7 +43,7 @@ cp -a darwin/lib/$CPU_TARGET/$lcl/*.dylib    $BUILD_DC_TMP_DIR/
 cd $BUILD_DC_TMP_DIR
 
 # Build all components of Double Commander
-./build.sh all
+./build.sh beta
 
 # Create *.dmg package
 mkdir -p $BUILD_PACK_DIR

install/darwin/install.sh

@@ -33,6 +33,7 @@ mkdir -p $DC_INSTALL_DIR/plugins/wfx/samba
 # Copy files
 cp -r doublecmd.app/*              $DC_APP_DIR/
 cp -a doublecmd                    $DC_INSTALL_DIR/
+cp -a doublecmd.zdli               $DC_INSTALL_DIR/
 cp -a install/darwin/doublecmd.xml $DC_INSTALL_DIR/
 cp -a doublecmd.ext.example        $DC_INSTALL_DIR/
 cp -a pixmaps.txt                  $DC_INSTALL_DIR/

src/doublecmd.lpr

@@ -23,11 +23,7 @@ uses
   Forms,
   LCLVersion,
   {$IF DEFINED(NIGHTLY_BUILD)}
-  {$IF NOT DEFINED(DARWIN)}
   un_lineinfo,
-  {$ELSE}
-  lnfodwrf,
-  {$ENDIF}
   {$ENDIF}
   uGlobsPaths,
   uGlobs,
@@ -62,7 +58,7 @@ var
 begin
   DCDebug('Starting Double Commander');
 
-  {$IF DEFINED(NIGHTLY_BUILD) AND NOT DEFINED(DARWIN)}
+  {$IF DEFINED(NIGHTLY_BUILD)}
   InitLineInfo;
   {$ENDIF}