use %token% macros instead of $1 and $2

This commit is contained in:
peter 2004-12-23 17:36:53 +00:00
parent 76a89eb263
commit 6d0688a552
2 changed files with 55 additions and 48 deletions

View File

@ -18,7 +18,7 @@ helpidx=fpctoc.htm
#
# Go32v2 packages
#
pack=Dos/~G~o32v2
pack=~D~os/Go32v2
binsub=\bin\go32v2
ppc386=ppc386
targetname=go32v2
@ -26,37 +26,37 @@ cfgfile=fpc.cfg
idecfgfile=fp.cfg
ideinifile=fp.ini
filecheck=*go32.zip
filecheck=*dos.zip
# Dos 1
package=basego32.zip,~B~asic system for Go32v2 (required)
package=basedos.zip,~B~asic system for Go32v2 (required)
# Dos 2
package=asldgo32.zip,GNU ~L~inker and GNU Assembler for Go32v2 (required)
package=aslddos.zip,GNU ~L~inker and GNU Assembler for Go32v2 (required)
# Dos 3
package=idego32.zip,~I~DE with integrated debugger/compiler (BETA)
package=idedos.zip,~I~DE with integrated debugger/compiler (BETA)
# Dos 4
package=utilgo32.zip,~E~xtra Utilities
package=utildos.zip,~E~xtra Utilities
# Dos 5
package=makego32.zip,GNU ~U~tilities (needed for Makefile usage)
package=makedos.zip,GNU ~U~tilities (needed for Makefile usage)
# Dos 6
package=gdbgo32.zip,GNU ~D~ebugger for Go32v2
package=gdbdos.zip,GNU ~D~ebugger for Go32v2
# Dos 7
package=ufclgo32.zip,~F~ree Component Libary (FCL)
package=ufcldos.zip,~F~ree Component Libary (FCL)
# Dos 8
package=ugdbintgo32.zip[ugdbgo32.zip],GDB Interfacing units
package=ugdbintdos.zip[ugdbdos.zip],GDB Interfacing units
# Dos 9
package=upaszlibgo32.zip[upzlgo32.zip],PasZLib units
package=upaszlibdos.zip[upzldos.zip],PasZLib units
# Dos 10
package=uregexprgo32.zip[ureggo32.zip],Regular expression units
package=uregexprdos.zip[uregdos.zip],Regular expression units
# Dos 11
package=uunzipgo32.zip[uzipgo32.zip],Unzip units
package=uunzipdos.zip[uzipdos.zip],Unzip units
# Dos 12
package=unetdbgo32.zip[undbgo32.zip],NetDB units
package=unetdbdos.zip[undbdos.zip],NetDB units
# Dos 13
package=upasjpeggo32.zip[upjpgo32.zip],Pas~J~PEG units
package=upasjpegdos.zip[upjpdos.zip],Pas~J~PEG units
# Dos 14
package=umd5go32.zip,Unit for MD~5~ processing
package=umd5dos.zip,Unit for MD~5~ processing
# Dos 15
package=ufvgo32.zip,Free ~V~ision (FV)
package=ufvdos.zip,Free ~V~ision (FV)
#
@ -459,35 +459,35 @@ defaultcfg=
# path to the messagefile, not necessary anymore but can be used to override
# the default language
#-Fr$1/msg/errore.msg
#-Fr$1/msg/errorn.msg
#-Fr$1/msg/errores.msg
#-Fr$1/msg/errord.msg
#-Fr$1/msg/errorr.msg
#-Fr%basepath%/msg/errore.msg
#-Fr%basepath%/msg/errorn.msg
#-Fr%basepath%/msg/errores.msg
#-Fr%basepath%/msg/errord.msg
#-Fr%basepath%/msg/errorr.msg
# path to the gcclib
#-Fl$1/lib
#-Fl%basepath%/lib
# 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$1/source/rtl/inc;$1/source/rtl/i386
#-Fi%basepath%/source/rtl/inc;%basepath%/source/rtl/i386
# searchpath for objectfiles
#-Fo$1/source/rtl/inc;$1/source/rtl/i386
#-Fo%basepath%/source/rtl/inc;%basepath%/source/rtl/i386
# searchpath for units and other system dependent things
-Fu$1/units/$FPCTARGET
-Fu$1/units/$FPCTARGET/*
-Fu$1/units/$FPCTARGET/rtl
-Fu%basepath%/units/%fpctargetmacro%
-Fu%basepath%/units/%fpctargetmacro%/*
-Fu%basepath%/units/%fpctargetmacro%/rtl
# searchpath for libraries
#-Fl$1/lib
#-Fl%basepath%/lib
#-Fl/lib;/usr/lib
# searchpath for tools
-FD$1/bin/$FPCTARGET
-FD%basepath%/bin/%fpctargetmacro%
# -------------
# Linking
@ -531,15 +531,15 @@ endcfg
defaultidecfg=
#IFDEF NORMAL
-T$FPCTARGET
-T$3
-Sg
-O1
-OG
-Op3
-Ratt
-Fu$1\units\$FPCTARGET
-Fu$1\units\$FPCTARGET\*
-Fu$1\units\$FPCTARGET\rtl
-Fu%basepath%\units\%fpctargetmacro%
-Fu%basepath%\units\%fpctargetmacro%\*
-Fu%basepath%\units\%fpctargetmacro%\rtl
-Cs131072
-Ch2097152
-g-
@ -548,7 +548,7 @@ defaultidecfg=
#ENDIF
#IFDEF DEBUG
-T$FPCTARGET
-T$3
-Sg
-Cr
-Ci
@ -556,9 +556,9 @@ defaultidecfg=
-OG
-Op3
-Ratt
-Fu$1\units\$FPCTARGET
-Fu$1\units\$FPCTARGET\*
-Fu$1\units\$FPCTARGET\rtl
-Fu%basepath%\units\%fpctargetmacro%
-Fu%basepath%\units\%fpctargetmacro%\*
-Fu%basepath%\units\%fpctargetmacro%\rtl
-Cs131072
-Ch2097152
-g
@ -567,16 +567,16 @@ defaultidecfg=
#ENDIF
#IFDEF RELEASE
-T$FPCTARGET
-T$3
-Sg
-O1
-O2
-OG
-Op3
-Ratt
-Fu$1\units\$FPCTARGET
-Fu$1\units\$FPCTARGET\*
-Fu$1\units\$FPCTARGET\rtl
-Fu%basepath%\units\%fpctargetmacro%
-Fu%basepath%\units\%fpctargetmacro%\*
-Fu%basepath%\units\%fpctargetmacro%\rtl
-Cs131072
-Ch2097152
-g-
@ -590,7 +590,7 @@ defaultideini=
CompileMode=DEBUG
[Help]
Files="$1\doc\fpctoc.htx"
Files="%basepath%\doc\fpctoc.htx"
[Editor]
DefaultTabSize=8
@ -638,8 +638,8 @@ endcfg
defaultsetpath=
@echo off
echo Setting PATH for use with $2 Free Pascal Compiler
set A=$1\bin\$2;%PATH%
echo Setting PATH for use with %targetname% Free Pascal Compiler
set A=%basepath%\bin\%targetname%;%PATH%
set Path=
set PATH=%A%
set A=

View File

@ -694,8 +694,12 @@ program install;
if assigned(cfgdata[i]) then
begin
s:=cfgdata[i]^;
Replace(s,'$1',data.basepath);
Replace(s,'$2',targetname);
Replace(s,'%basepath%',data.basepath);
Replace(s,'%targetname%',targetname);
if pos('-',targetname)=0 then
Replace(s,'%fpctargetmacro%','$FPCOS')
else
Replace(s,'%fpctargetmacro%','$FPCTARGET');
writeln(t,s);
end
else
@ -1999,7 +2003,10 @@ begin
end.
{
$Log$
Revision 1.23 2004-12-22 15:28:48 peter
Revision 1.24 2004-12-23 17:36:53 peter
use %token% macros instead of $1 and $2
Revision 1.23 2004/12/22 15:28:48 peter
* more fixes for win32 installer
Revision 1.22 2004/12/21 18:52:31 peter