Browse Source

--- Merging r14630 into '.':
U compiler/utils/fpc.cft
C compiler/utils/fpccfg.inc
U compiler/utils/samplecfg
Summary of conflicts:
Text conflicts: 1

# revisions: 14596,14630
------------------------------------------------------------------------
r14596 | florian | 2010-01-10 14:24:41 +0100 (Sun, 10 Jan 2010) | 1 line
Changed paths:
M /trunk/rtl/objpas/sysutils/sysutilh.inc

* superfluos empty lines removed
------------------------------------------------------------------------
------------------------------------------------------------------------
r14630 | jonas | 2010-01-12 21:25:28 +0100 (Tue, 12 Jan 2010) | 5 lines
Changed paths:
M /trunk/compiler/utils/fpc.cft
M /trunk/compiler/utils/fpccfg.inc
M /trunk/compiler/utils/samplecfg

* fixed search path for httpd units in fpc.cft & fpccfg.inc
(mantis #15501)
- removed "include path search paths" from default configs, since they
don't make sense anymore nowadays

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@15314 -

marco 15 years ago
parent
commit
9815e28ca0
3 changed files with 27 additions and 55 deletions
  1. 3 15
      compiler/utils/fpc.cft
  2. 24 37
      compiler/utils/fpccfg.inc
  3. 0 3
      compiler/utils/samplecfg

+ 3 - 15
compiler/utils/fpc.cft

@@ -126,25 +126,13 @@
 # path to the gcclib
 #-Fl%basepath%/lib
 
-# searchpath for includefiles
-#-Fi/pp/inc;/pp/rtl/inc
-
-# searchpath for includefiles
-# release them only if you know what you do
-# because this could cause a rebuild of the runtime library
-# if you tell them compiler/ide to build the project (FK)
-#-Fi%basepath%/source/rtl/inc;%basepath%/source/rtl/i386
-
-# searchpath for objectfiles
-#-Fo%basepath%/source/rtl/inc;%basepath%/source/rtl/i386
-
 #IFDEF FPCAPACHE_1_13
--Fu%basepath%/units/$FPCTARGET/httpd-1.3/
+-Fu%basepath%/units/$FPCTARGET/httpd13/
 #ELSE
 #IFDEF FPCAPACHE_2_0
--Fu%basepath%/units/$FPCTARGET/httpd-2.0
+-Fu%basepath%/units/$FPCTARGET/httpd20
 #ELSE
--Fu%basepath%/units/$FPCTARGET/httpd-2.2
+-Fu%basepath%/units/$FPCTARGET/httpd22
 #ENDIF
 #ENDIF
 

+ 24 - 37
compiler/utils/fpccfg.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const DefaultConfig : array[0..24] of string[240]=(
+const DefaultConfig : array[0..23] of string[240]=(
 {$else Delphi}
-const DefaultConfig : array[0..24,1..240] of char=(
+const DefaultConfig : array[0..23,1..240] of char=(
 {$endif Delphi}
   '#'#010+
   '# Config file generated by fpcmkcfg on %BUILDDATE% - %BUILDTIME%'#010+
@@ -139,35 +139,23 @@ const DefaultConfig : array[0..24,1..240] of char=(
   '# path to the gcclib'#010+
   '#-Fl%basepath%/lib'#010+
   #010+
-  '# searchpath for includefiles'#010+
-  '#-Fi/pp/inc;/pp/rtl/inc'#010+
-  #010+
-  '# searchpa','th for includefiles'#010+
-  '# release them only if you know what you do'#010+
-  '# because this could cause a rebuild of the runtime library'#010+
-  '# if you tell them compiler/ide to build the project (FK)'#010+
-  '#-Fi%basepath%/source/rtl/inc;%basepath%/source/rtl/i386'#010+
-  #010,
-  '# searchpath for objectfiles'#010+
-  '#-Fo%basepath%/source/rtl/inc;%basepath%/source/rtl/i386'#010+
-  #010+
   '#IFDEF FPCAPACHE_1_13'#010+
-  '-Fu%basepath%/units/$FPCTARGET/httpd-1.3/'#010+
-  '#ELSE'#010+
+  '-Fu%basepath%/units/$FPCTARGET/httpd13/'#010+
+  '#EL','SE'#010+
   '#IFDEF FPCAPACHE_2_0'#010+
-  '-Fu%basepath%/units/$FPCTARGET/httpd-2.0'#010+
+  '-Fu%basepath%/units/$FPCTARGET/httpd20'#010+
   '#ELSE'#010+
-  '-Fu%basepath%/u','nits/$FPCTARGET/httpd-2.2'#010+
+  '-Fu%basepath%/units/$FPCTARGET/httpd22'#010+
   '#ENDIF'#010+
   '#ENDIF'#010+
   #010+
   '# searchpath for units and other system dependent things'#010+
   '-Fu%basepath%/units/$FPCTARGET/'#010+
-  '-Fu%basepath%/units/$FPCTARGET/*'#010+
+  '-Fu%basepath%/units/$FPCTARG','ET/*'#010+
   '-Fu%basepath%/units/$FPCTARGET/rtl'#010+
   #010+
   '# searchpath for libraries'#010+
-  '#-Fl%basepath%','/lib'#010+
+  '#-Fl%basepath%/lib'#010+
   '#-Fl/lib;/usr/lib'#010+
   #010+
   '# searchpath for tools'#010+
@@ -175,7 +163,7 @@ const DefaultConfig : array[0..24,1..240] of char=(
   #010+
   '# binutils prefix for cross compiling'#010+
   '#IFDEF FPC_CROSSCOMPILING'#010+
-  '  -XP$FPCTARGET-'#010+
+  '  -XP$FPCTARGET-'#010,
   '#ENDIF'#010+
   #010+
   #010+
@@ -183,22 +171,21 @@ const DefaultConfig : array[0..24,1..240] of char=(
   '# Linking'#010+
   '# -------------'#010+
   #010+
-  '# generate always debugging in','formation for GDB (slows down the comp'+
-  'iling'#010+
+  '# generate always debugging information for GDB (slows down the compil'+
+  'ing'#010+
   '# process)'#010+
   '#      -gc        generate checks for pointers'#010+
   '#      -gd        use dbx'#010+
   '#      -gg        use gsym'#010+
-  '#      -gh        use heap trace unit (for memory leak debugging)'#010+
-  '#      -gl        u','se line info unit to show more info for backtrace'+
-  's'#010+
+  '#  ','    -gh        use heap trace unit (for memory leak debugging)'#010+
+  '#      -gl        use line info unit to show more info for backtraces'#010+
   '#      -gv        generates programs tracable with valgrind'#010+
-  '#      -gw        generate dwarf debugging info'#010+
+  '#      -gw        generate dwarf debugging info',#010+
   '#'#010+
   '# Enable debuginfo and use the line info unit by default'#010+
   '#-gl'#010+
   #010+
-  '# always pass an',' option to the linker'#010+
+  '# always pass an option to the linker'#010+
   '#-k-s'#010+
   #010+
   '# Always strip debuginfo from the executable'#010+
@@ -209,26 +196,26 @@ const DefaultConfig : array[0..24,1..240] of char=(
   '# Miscellaneous'#010+
   '# -------------'#010+
   #010+
-  '# Write always a nice FPC logo ;)'#010+
+  '# Write always a nice FPC log','o ;)'#010+
   '-l'#010+
   #010+
   '# Verbosity'#010+
   '#      e : Show errors (default)       d : Show debug info'#010+
-  '# ','     w : Show warnings               u : Show unit info'#010+
+  '#      w : Show warnings               u : Show unit info'#010+
   '#      n : Show notes                  t : Show tried/used files'#010+
-  '#      h : Show hints                  m : Show defined macros'#010+
-  '#      i : Show general info           p : Show compiled',' procedures'#010+
+  '#      h : Show hints                ','  m : Show defined macros'#010+
+  '#      i : Show general info           p : Show compiled procedures'#010+
   '#      l : Show linenumbers            c : Show conditionals'#010+
   '#      a : Show everything             0 : Show nothing (except errors'+
   ')'#010+
-  '#      b : Show all procedure          r : Rhide/GCC compatibility mod'+
-  'e'#010+
-  '#          declarations',' if an error    x : Executable info (Win32 on'+
-  'ly)'#010+
+  '#      b : Sh','ow all procedure          r : Rhide/GCC compatibility m'+
+  'ode'#010+
+  '#          declarations if an error    x : Executable info (Win32 only'+
+  ')'#010+
   '#          occurs'#010+
   '#'#010+
   '# Display Info, Warnings, Notes and Hints'#010+
   '-viwn'#010+
-  '# If you don'#039't want so much verbosity use'#010+
+  '# If you don'#039't want so much verbosity use',#010+
   '#-vw'#010
 );

+ 0 - 3
compiler/utils/samplecfg

@@ -375,9 +375,6 @@ $CPUCROSSIFDEF2
 #-Fr$FPCPATH/msg/errore.msg
 #-Fr$FPCPATH/msg/errorn.msg
 
-# searchpath for includefiles
-#-Fi/pp/inc;/pp/rtl/inc
-
 #IFDEF FPCAPACHE_1_3
 -Fu$FPCPATH/units/\$fpctarget/httpd13/
 #ELSE