* Create fppkg-config files in the new format (v5)

git-svn-id: trunk@34729 -

compiler/utils/samplecfg

@@ -42,11 +42,13 @@ if [ -w "$sysdir" ] ; then
   fppkgfile="$sysdir"/fppkg.cfg
   defaultfile="$sysdir"/fppkg/default
   compilerconfigdir="-d CompilerConfigDir=$sysdir/fppkg"
+  fppkgconfdir=$sysdir/fppkg/conf.d
 else
   echo No write premission in $sysdir.
   fpccfgfile="$HOME"/.fpc.cfg
   fppkgfile="$HOME"/.config/fppkg.cfg
   defaultfile="$HOME"/.fppkg/config/default
+  fppkgconfdir="$HOME"/.fppkg/config/conf.d
 fi
 #
 
@@ -70,7 +72,8 @@ fi
 # set right path to FPC with $fpcversion
 FPCPATH=`dirname "$1"`/\$fpcversion
 # set right prefix to FPC
-FPCGLOBALPREFIX=`dirname "$1"`/../../
+FPCGLOBALPATH=`dirname "$1"`
+FPCGLOBALPREFIX="$FPCGLOBALPATH"/../../
 
 # Write (.)fpc.cfg
 echo Writing sample configuration file to $fpccfgfile
@@ -93,8 +96,13 @@ fi
 
 # Write fppkg.cfg
 echo Writing sample configuration file to $fppkgfile
-${FPCMKCFGBIN} -p -3 $compilerconfigdir -o $fppkgfile
+${FPCMKCFGBIN} -p -3 -d "GlobalPrefix=$FPCGLOBALPREFIX" -d "GlobalPath=$FPCGLOBALPATH" $compilerconfigdir -o $fppkgfile
 
 # Write default
 echo Writing sample configuration file to $defaultfile
 ${FPCMKCFGBIN} -p -4 -d "GlobalPrefix=$FPCGLOBALPREFIX" -d "FpcBin=$FPCBIN" -o $defaultfile
+
+# Create (empty) directory for fppkg-configuration files for extensions
+if ! [ -d "$fppkgconfdir" ] ; then
+  mkdir "$fppkgconfdir"
+fi

utils/fpcmkcfg/default.cft

@@ -1,7 +1,5 @@
 [Defaults]
-ConfigVersion=4
+ConfigVersion=5
-GlobalPrefix=%GlobalPrefix%
-LocalPrefix={LocalRepository}
 Compiler=%fpcbin%
 OS=%fpctargetos%
 CPU=%fpctarget%

utils/fpcmkcfg/default.inc

@@ -4,9 +4,7 @@ const fppkg_default : array[0..0] of string[240]=(
 const fppkg_default : array[0..0,1..240] of char=(
 {$endif Delphi}
   '[Defaults]'#010+
-  'ConfigVersion=4'#010+
+  'ConfigVersion=5'#010+
-  'GlobalPrefix=%GlobalPrefix%'#010+
-  'LocalPrefix={LocalRepository}'#010+
   'Compiler=%fpcbin%'#010+
   'OS=%fpctargetos%'#010+
   'CPU=%fpctarget%'#010

utils/fpcmkcfg/fppkg.cfg

@@ -1,5 +1,5 @@
 [Defaults]
-ConfigVersion=4
+ConfigVersion=5
 LocalRepository=%LocalRepository%
 BuildDir={LocalRepository}build/
 ArchivesDir={LocalRepository}archives/
@@ -9,3 +9,20 @@ RemoteRepository=auto
 CompilerConfig=default
 FPMakeCompilerConfig=default
 Downloader=lnet
+InstallRepository=user
+
+[Repository]
+Name=fpc
+Description=Packages which are installed along with the Free Pascal Compiler
+Path=%GlobalPath%/{CompilerVersion}/
+Prefix=%GlobalPrefix%
+
+[Repository]
+Name=user
+Description=User-installed packages
+Path={LocalRepository}lib/fpc/{CompilerVersion}/
+Prefix={LocalRepository}
+
+[IncludeFiles]
+FileMask=%CompilerConfigDir%conf.d/*.conf
+

utils/fpcmkcfg/fppkg.inc

@@ -1,10 +1,10 @@
 {$ifdef Delphi}
-const fppkg : array[0..1] of string[240]=(
+const fppkg : array[0..2] of string[240]=(
 {$else Delphi}
-const fppkg : array[0..1,1..240] of char=(
+const fppkg : array[0..2,1..240] of char=(
 {$endif Delphi}
   '[Defaults]'#010+
-  'ConfigVersion=4'#010+
+  'ConfigVersion=5'#010+
   'LocalRepository=%LocalRepository%'#010+
   'BuildDir={LocalRepository}build/'#010+
   'ArchivesDir={LocalRepository}archives/'#010+
@@ -13,5 +13,23 @@ const fppkg : array[0..1,1..240] of char=(
   'Remote','Repository=auto'#010+
   'CompilerConfig=default'#010+
   'FPMakeCompilerConfig=default'#010+
-  'Downloader=lnet'#010
+  'Downloader=lnet'#010+
+  'InstallRepository=user'#010+
+  #010+
+  '[Repository]'#010+
+  'Name=fpc'#010+
+  'Description=Packages which are installed along with the Free Pascal Co'+
+  'mpiler'#010+
+  'Path=%GlobalPath%/{CompilerVersio','n}/'#010+
+  'Prefix=%GlobalPrefix%'#010+
+  #010+
+  '[Repository]'#010+
+  'Name=user'#010+
+  'Description=User-installed packages'#010+
+  'Path={LocalRepository}lib/fpc/{CompilerVersion}/'#010+
+  'Prefix={LocalRepository}'#010+
+  #010+
+  '[IncludeFiles]'#010+
+  'FileMask=%CompilerConfigDir%conf.d/*.conf'#010+
+  #010
 );