Forráskód Böngészése

UPD: Move extractdwrflnfo into tools subdirectory

Alexander Koblov 13 éve
szülő
commit
43a5d6c226
6 módosított fájl, 75 hozzáadás és 9 törlés
  1. 3 4
      build.bat
  2. 3 3
      build.sh
  3. 2 1
      clean.bat
  4. 1 1
      clean.sh
  5. 66 0
      tools/extractdwrflnfo.lpi
  6. 0 0
      tools/extractdwrflnfo.lpr

+ 3 - 4
build.bat

@@ -2,9 +2,8 @@
 
 rem the next two line must be changed before run on your computer
 set lazpath=D:\Alexx\Prog\FreePascal\Lazarus
-set fpcpath=%lazpath%\fpc\2.6.0\bin\x86_64-win64
 
-set PATH=%lazpath%;%fpcpath%;%PATH%
+set PATH=%lazpath%;%PATH%
 
 rem You can execute this script with different parameters:
 rem components - compiling components needed for DC
@@ -57,10 +56,10 @@ GOTO:EOF
   lazbuild src\doublecmd.lpi --bm=beta %DC_ARCH%
 
   rem Build Dwarf LineInfo Extractor
-  fpc src\extractdwrflnfo.lpr
+  lazbuild tools\extractdwrflnfo.lpi
 
   rem Extract debug line info
-  src\extractdwrflnfo doublecmd.dbg
+  tools\extractdwrflnfo doublecmd.dbg
 GOTO:EOF
 
 :all

+ 3 - 3
build.sh

@@ -44,11 +44,11 @@ build_beta()
   $lazbuild src/doublecmd.lpi --bm=beta $DC_ARCH
   
   # Build Dwarf LineInfo Extractor
-  fpc src/extractdwrflnfo.lpr
+  $lazbuild tools/extractdwrflnfo.lpi
   
   # Extract debug line info
-  chmod a+x src/extractdwrflnfo
-  src/extractdwrflnfo doublecmd.dbg
+  chmod a+x tools/extractdwrflnfo
+  tools/extractdwrflnfo doublecmd.dbg
   
   # Strip debug info
   strip --strip-all doublecmd

+ 2 - 1
clean.bat

@@ -11,7 +11,8 @@
 @del /Q doc\en\dev-help\*.*
 
 @echo Clean up tools output directories
-@del /Q src\extractdwrflnfo.exe
+@del /Q /S tools\lib\*.*
+@del /Q tools\extractdwrflnfo.exe
 
 @echo Clean up plugins output directories
 @del /Q /S plugins\dsx\DSXLocate\lib\*.*

+ 1 - 1
clean.sh

@@ -23,7 +23,7 @@ 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/extractdwrflnfo
+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

+ 66 - 0
tools/extractdwrflnfo.lpi

@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="9"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <SaveClosedFiles Value="False"/>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <SaveJumpHistory Value="False"/>
+        <SaveFoldState Value="False"/>
+      </Flags>
+      <SessionStorage Value="None"/>
+      <MainUnit Value="0"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <i18n>
+      <EnableI18N LFM="False"/>
+    </i18n>
+    <VersionInfo>
+      <StringTable ProductVersion=""/>
+    </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
+      <ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
+    </PublishOptions>
+    <RunParams>
+      <local>
+        <FormatVersion Value="1"/>
+      </local>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="extractdwrflnfo.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="extractdwrflnfo"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="$(ProjOutDir)"/>
+      <OtherUnitFiles Value="..\src"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+        <UseLineInfoUnit Value="False"/>
+      </Debugging>
+    </Linking>
+    <Other>
+      <CompilerPath Value="$(CompPath)"/>
+    </Other>
+  </CompilerOptions>
+</CONFIG>

+ 0 - 0
src/extractdwrflnfo.lpr → tools/extractdwrflnfo.lpr