Bläddra i källkod

+ fp ide templates
+ data2inc commands added in comment
+ preinstall svn support to the ide

git-svn-id: trunk@4715 -

florian 19 år sedan
förälder
incheckning
8d21a43989
5 ändrade filer med 143 tillägg och 6 borttagningar
  1. 2 0
      .gitattributes
  2. 4 3
      compiler/utils/fpcmkcfg.pp
  3. 47 0
      compiler/utils/fpinc.cfg
  4. 65 0
      compiler/utils/fpinc.ini
  5. 25 3
      compiler/utils/fpini.inc

+ 2 - 0
.gitattributes

@@ -492,6 +492,8 @@ compiler/utils/fpcfg.inc svneol=native#text/plain
 compiler/utils/fpcmkcfg.pp svneol=native#text/plain
 compiler/utils/fpcsubst.pp svneol=native#text/plain
 compiler/utils/fpimpdef.pp svneol=native#text/plain
+compiler/utils/fpinc.cfg svneol=native#text/plain
+compiler/utils/fpinc.ini svneol=native#text/plain
 compiler/utils/fpini.inc svneol=native#text/plain
 compiler/utils/fppkg.pp svneol=native#text/plain
 compiler/utils/gia64reg.pp svneol=native#text/plain

+ 4 - 3
compiler/utils/fpcmkcfg.pp

@@ -19,10 +19,11 @@ program fpcmkcfg;
 uses usubst,SysUtils,Classes;
 
 {
-  The fpccfg.inc file must be built from a template with the data2inc
-  command.  it needs options:
+  The inc files must be built from a template with the data2inc
+  command.
   data2inc -b -s fpc.cft fpccfg.inc DefaultConfig
-  where fpc.cft is the template file.
+  data2inc -b -s fpinc.ini fpini.inc fpini
+  data2inc -b -s fpinc.cfg fpcfg.inc fpcfg
 }
 
 {$i fpccfg.inc}

+ 47 - 0
compiler/utils/fpinc.cfg

@@ -0,0 +1,47 @@
+#IFDEF NORMAL
+ -T%fpctargetos%
+ -Sg
+ -O1
+ -OG
+ -Op3
+ -Ratt
+ -Fu%basepath%\units\%fpctarget%-%fpctargetos%
+ -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
+ -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl
+ -g-
+ -p-
+ -b-
+#ENDIF
+
+#IFDEF DEBUG
+ -T%fpctargetos%
+ -Sg
+ -Cr
+ -Ci
+ -Co
+ -OG
+ -Op3
+ -Ratt
+ -Fu%basepath%\units\%fpctarget%-%fpctargetos%
+ -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
+ -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl
+ -g
+ -p-
+ -b-
+#ENDIF
+
+#IFDEF RELEASE
+ -T%fpctargetos%
+ -Sg
+ -O1
+ -O2
+ -OG
+ -Op3
+ -Ratt
+ -Fu%basepath%\units\%fpctarget%-%fpctargetos%
+ -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
+ -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl
+ -g-
+ -p-
+ -b-
+#ENDIF

+ 65 - 0
compiler/utils/fpinc.ini

@@ -0,0 +1,65 @@
+[Compile]
+CompileMode=DEBUG
+
+[Editor]
+DefaultTabSize=8
+DefaultFlags=20599
+DefaultSaveExt=.pas
+DefaultIndentSize=1
+
+[Highlight]
+Exts="*.pas;*.pp;*.inc"
+NeedsTabs="make*;make*.*"
+
+[SourcePath]
+SourceList=""
+
+[Mouse]
+DoubleDelay=8
+ReverseButtons=0
+AltClickAction=6
+CtrlClickAction=1
+
+[Search]
+FindFlags=4
+
+[Breakpoints]
+Count=0
+
+[Watches]
+Count=0
+
+[Preferences]
+DesktopFileFlags=209
+CenterCurrentLineWhileDebugging=1
+AutoSaveFlags=7
+MiscOptions=6
+DesktopLocation=1
+
+[Misc]
+ShowReadme=1
+
+[Files]
+OpenExts="*.pas;*.pp;*.inc"
+
+[Tools]
+Title1="svn ~u~p (curr. dir)"
+Program1="svn"
+Params1="up $CAP_MSG()"
+HotKey1=22784
+Title2="svn c~i~ (curr. dir)"
+Program2="svn"
+Params2="ci $CAP_MSG()"
+HotKey2=23040
+Title3="svn ~d~iff"
+Program3="svn"
+Params3="diff $CAP_MSG() $EDNAME"
+HotKey3=23296
+Title4="svn ~l~og"
+Program4="svn"
+Params4="log $CAP_MSG() $EDNAME"
+HotKey4=23552
+Title5="svn ~b~lame"
+Program5="svn"
+Params5="blame $CAP_MSG() $EDNAME"
+HotKey5=23808

+ 25 - 3
compiler/utils/fpini.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const fpini : array[0..2] of string[240]=(
+const fpini : array[0..4] of string[240]=(
 {$else Delphi}
-const fpini : array[0..2,1..240] of char=(
+const fpini : array[0..4,1..240] of char=(
 {$endif Delphi}
   '[Compile]'#013#010+
   'CompileMode=DEBUG'#013#010+
@@ -45,5 +45,27 @@ const fpini : array[0..2,1..240] of char=(
   'ShowReadme=1'#013#010+
   #013#010+
   '[Files]'#013#010+
-  'OpenExts="*.pas;*.pp;*.inc"'#013#010
+  'OpenExts="*.pas;*.pp;*.inc"'#013#010+
+  #013#010+
+  '[Tools]'#013#010+
+  'Title1="svn ~u~p (curr. dir)"'#013#010+
+  'Program1="svn"'#013#010+
+  'Params1="up $CAP_MSG()"'#013#010+
+  'HotKey1=22784'#013#010+
+  'Title2="svn c~i~ (curr. dir)"'#013#010+
+  'Program2="svn"'#013#010+
+  'Params2="ci ','$CAP_MSG()"'#013#010+
+  'HotKey2=23040'#013#010+
+  'Title3="svn ~d~iff"'#013#010+
+  'Program3="svn"'#013#010+
+  'Params3="diff $CAP_MSG() $EDNAME"'#013#010+
+  'HotKey3=23296'#013#010+
+  'Title4="svn ~l~og"'#013#010+
+  'Program4="svn"'#013#010+
+  'Params4="log $CAP_MSG() $EDNAME"'#013#010+
+  'HotKey4=23552'#013#010+
+  'Title5="svn ~b~lame"'#013#010+
+  'Program5="svn"'#013#010+
+  'Pa','rams5="blame $CAP_MSG() $EDNAME"'#013#010+
+  'HotKey5=23808'#013#010
 );