Quellcode durchsuchen

* regenerated

git-svn-id: trunk@8774 -
florian vor 18 Jahren
Ursprung
Commit
0907f3c73b
2 geänderte Dateien mit 20 neuen und 8 gelöschten Zeilen
  1. 15 3
      compiler/utils/Makefile
  2. 5 5
      compiler/utils/fpini.inc

+ 15 - 3
compiler/utils/Makefile

@@ -1,11 +1,12 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/08/22]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/12]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
+OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
 .PHONY: FORCE
 override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
@@ -56,6 +57,11 @@ else
 SRCBATCHEXT=.bat
 endif
 endif
+ifdef COMSPEC
+ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
+RUNBATCH=$(COMSPEC) /C
+endif
+endif
 ifdef inUnix
 PATHSEP=/
 else
@@ -1801,7 +1807,7 @@ override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX) 
+override FPCOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
@@ -1933,9 +1939,13 @@ ifeq (,$(findstring -s ,$(COMPILER)))
 EXECPPAS=
 else
 ifeq ($(FULL_SOURCE),$(FULL_TARGET))
+ifdef RUNBATCH
+EXECPPAS:=@$(RUNBATCH) $(PPAS)
+else
 EXECPPAS:=@$(PPAS)
 endif
 endif
+endif
 .PHONY: fpc_exes
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
@@ -2314,11 +2324,13 @@ ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
 	$(COMPILER) ppudump.pp -Fu../$(CPU_TARGET) -Fi..
 ppumove$(EXEEXT): ppumove.pp ppu$(PPUEXT)
 fpcsubst$(EXEEXT): fpcsubst.pp usubst.pp
-fpcmkcfg$(EXEEXT): fpcmkcfg.pp usubst.pp fpccfg.inc fpcfg.inc
+fpcmkcfg$(EXEEXT): fpcmkcfg.pp usubst.pp fpccfg.inc fpcfg.inc fpini.inc
 ifneq ($(DATA2INC),)
 fpccfg.inc: fpc.cft
 	$(DATA2INC) -b -s fpc.cft fpccfg.inc DefaultConfig
 fpcfg.inc : fpinc.cfg
 	$(DATA2INC) -b -s fpinc.cfg fpcfg.inc fpcfg
+fpini.inc : fpinc.ini
+	$(DATA2INC) -b -s fpinc.ini fpini.inc fpini
 endif
 unexport PPUFILES PPUMOVE

+ 5 - 5
compiler/utils/fpini.inc

@@ -51,21 +51,21 @@ const fpini : array[0..4,1..240] of char=(
   'Title1="svn ~u~p (curr. dir)"'#013#010+
   'Program1="svn"'#013#010+
   'Params1="up $CAP_MSG()"'#013#010+
-  'HotKey1=22784'#013#010+
+  'HotKey1=23296'#013#010+
   'Title2="svn c~i~ (curr. dir)"'#013#010+
   'Program2="svn"'#013#010+
   'Params2="ci ','$CAP_MSG()"'#013#010+
-  'HotKey2=23040'#013#010+
+  'HotKey2=23552'#013#010+
   'Title3="svn ~d~iff"'#013#010+
   'Program3="svn"'#013#010+
   'Params3="diff $CAP_MSG() $EDNAME"'#013#010+
-  'HotKey3=23296'#013#010+
+  'HotKey3=23808'#013#010+
   'Title4="svn ~l~og"'#013#010+
   'Program4="svn"'#013#010+
   'Params4="log $CAP_MSG() $EDNAME"'#013#010+
-  'HotKey4=23552'#013#010+
+  'HotKey4=34560'#013#010+
   'Title5="svn ~b~lame"'#013#010+
   'Program5="svn"'#013#010+
   'Pa','rams5="blame $CAP_MSG() $EDNAME"'#013#010+
-  'HotKey5=23808'#013#010
+  'HotKey5=34816'#013#010
 );