Selaa lähdekoodia

* samplecfg now also creates fppkg configuration files

git-svn-id: trunk@17190 -
joost 14 vuotta sitten
vanhempi
commit
fe503598c1
1 muutettua tiedostoa jossa 21 lisäystä ja 0 poistoa
  1. 21 0
      compiler/utils/samplecfg

+ 21 - 0
compiler/utils/samplecfg

@@ -23,6 +23,7 @@ else
 fi
 fi
 FPCBIN=`dirname "$1"`/../../bin/fpc
 FPCBIN=`dirname "$1"`/../../bin/fpc
 FPBIN=`dirname "$1"`/../../bin/fp
 FPBIN=`dirname "$1"`/../../bin/fp
+FPPKGBIN=`dirname "$1"`/../../bin/fppkg
 sysfpdirbase=`dirname "$1"`/`"$FPCBIN" -iV`
 sysfpdirbase=`dirname "$1"`/`"$FPCBIN" -iV`
 sysfpdirbase2=$sysfpdirbase/ide
 sysfpdirbase2=$sysfpdirbase/ide
 sysfpdir=$sysfpdirbase2/text
 sysfpdir=$sysfpdirbase2/text
@@ -31,9 +32,14 @@ sysfpdir=$sysfpdirbase2/text
 if [ -w "$sysdir" ] ; then
 if [ -w "$sysdir" ] ; then
   echo Write permission in $sysdir.
   echo Write permission in $sysdir.
   fpccfgfile="$sysdir"/fpc.cfg
   fpccfgfile="$sysdir"/fpc.cfg
+  fppkgfile="$sysdir"/fppkg.cfg
+  defaultfile="$sysdir"/fppkg/default
+  compilerconfigdir="-d CompilerConfigDir=$sysdir/fppkg"
 else
 else
   echo No write premission in $sysdir.
   echo No write premission in $sysdir.
   fpccfgfile="$HOME"/.fpc.cfg
   fpccfgfile="$HOME"/.fpc.cfg
+  fppkgfile="$HOME"/.config/fppkg.cfg
+  defaultfile="$HOME"/.fppkg/config/default
 fi
 fi
 #
 #
 
 
@@ -56,6 +62,8 @@ fi
 
 
 # set right path to FPC with $fpcversion
 # set right path to FPC with $fpcversion
 FPCPATH=`dirname "$1"`/\$fpcversion
 FPCPATH=`dirname "$1"`/\$fpcversion
+# set right prefix to FPC
+FPCGLOBALPREFIX=`dirname "$1"`/../../
 
 
 # Write (.)fpc.cfg
 # Write (.)fpc.cfg
 echo Writing sample configuration file to $fpccfgfile
 echo Writing sample configuration file to $fpccfgfile
@@ -72,3 +80,16 @@ fpcmkcfg -p -1 -d "basepath=$FPCPATH" -o $fpcfgfile
 # Write fp.ini
 # Write fp.ini
 echo Writing sample configuration file to $fpinifile
 echo Writing sample configuration file to $fpinifile
 fpcmkcfg -p -2 -o $fpinifile
 fpcmkcfg -p -2 -o $fpinifile
+
+# Do not write fppkg configuration when fppkg is not available
+if ! [ -f "$FPPKGBIN" ] ; then
+  exit
+fi
+
+# Write fppkg.cfg
+echo Writing sample configuration file to $fppkgfile
+fpcmkcfg -p -3 $compilerconfigdir -o $fppkgfile
+
+# Write default
+echo Writing sample configuration file to $defaultfile
+fpcmkcfg -p -4 -d "GlobalPrefix=$FPCGLOBALPREFIX" -o $defaultfile