[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5892f9a65b35fb8ff23adffa40dd295315d3bb3e)

Treeve Jelbert scm at sourcemage.org
Sun Aug 31 15:21:18 EDT 2008


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 devel/lazarus/BUILD     |   51 ++++++++++++++++++++++++++++++++++++++++++++++--
 devel/lazarus/CONFIGURE |    5 +++-
 devel/lazarus/HISTORY   |    3 ++
 devel/lazarus/INSTALL   |    8 ++++++-
 4 files changed, 63 insertions(+), 4 deletions(-)

New commits:
commit 3914f00690e743f560725fe6b5297022e8a22c01
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    lazarus - enable packages

diff --git a/devel/lazarus/BUILD b/devel/lazarus/BUILD
index 387fb21..08d55cc 100755
--- a/devel/lazarus/BUILD
+++ b/devel/lazarus/BUILD
@@ -1,5 +1,52 @@
-export LCL_PLATFORM=$LAZ_GUI          &&
+local FF PP TARGET UNIT              &&
+if  [[  "${SMGL_COMPAT_ARCHS[1]}"  ==  "x86_64"  ]];  then
+  TARGET=x86_64
+else
+  TARGET=i386
+fi  &&
+
+
+#create idemake.cfg
+#LazarusDir=$SOURCE_DIRECTORY        &&
+mkdir -p ~/.lazarus                 &&
+cat > idemake.cfg << EOF
+#-Fu\$(LazarusDir)/components/synedit/units/$TARGET-linux/
+#-Fu\$(LazarusDir)/components/synedit/units/$TARGET-linux/
+#-Fu\$(LazarusDir)/ideintf/units/$TARGET-linux/
+#-Fu\$(LazarusDir)/lcl/units/$TARGET-linux/
+#-Fu\$(LazarusDir)/lcl/units/$TARGET-linux/$LAZ_GUI/
+#-Fu\$(LazarusDir)/components/codetools/units/$TARGET-linux/
+#-Fu\$(LazarusDir)/packager/units/$TARGET-linux/
+-Fu.
+-dLCL
+-dLCL${LAZ_GUI}
+-dAddStaticPkgs
+-Fi~/.lazarus/
+EOF
+#export LCL_PLATFORM=$LAZ_GUI          &&
 make_single                           &&
-make FPC=fpc                          &&
+make LCL_PLATFORM=$LAZ_GUI            &&
+UNIT=$SOURCE_DIRECTORY/components     &&
+cd $SOURCE_DIRECTORY/components       &&
+for FF in $LAZ_PACK;do
+  if [[ $FF == lazreport ]];then
+    FF=$FF/source
+    echo -Fu${UNIT}/$FF/lib/$TARGET-linux/ >> ../idemake.cfg
+  else
+    echo -Fu${UNIT}/$FF/lib/$TARGET-linux/$LAZ_GUI/ >> ../idemake.cfg
+  fi                                  &&
+  cp ../idemake.cfg ~/.lazarus        &&
+  cd $FF                              &&
+  $SOURCE_DIRECTORY/lazbuild -B `ls *.lpk` --ws=$LAZ_GUI &&
+# add to package list
+  PP=`grep '<Name Value=' *.lpk|cut -d\" -f2`  &&
+  echo $PP, >> $SOURCE_DIRECTORY/staticpackages.inc   &&
+  cd -
+done                                  &&
+cd $SOURCE_DIRECTORY                  &&
+cp staticpackages.inc ~/.lazarus      &&
+make LCL_PLATFORM=$LAZ_GUI idepkg     &&
+cp ~/.lazarus/packagefiles.xml ./     &&
+sed -i "s|$SOURCE_DIRECTORY|$TRACK_ROOT/usr/share/lazarus|" idemake.cfg &&
 strip -s lazarus startlazarus         &&
 make_normal
diff --git a/devel/lazarus/CONFIGURE b/devel/lazarus/CONFIGURE
index 1b541c8..1599e56 100755
--- a/devel/lazarus/CONFIGURE
+++ b/devel/lazarus/CONFIGURE
@@ -1 +1,4 @@
-config_query_list LAZ_GUI "which gui?" qt gtk2 gtk
+. $GRIMOIRE/config_query_multi.function &&
+config_query_list LAZ_GUI "which gui?" qt gtk2 gtk  &&
+config_query_multi LAZ_PACK "which packages to build?" \
+                   lazreport opengl paradox printers sqldb sqlite
diff --git a/devel/lazarus/HISTORY b/devel/lazarus/HISTORY
index d35d33a..74ba8dc 100644
--- a/devel/lazarus/HISTORY
+++ b/devel/lazarus/HISTORY
@@ -1,3 +1,6 @@
+2008-08-31 Treeve Jelbert <treeve at sourcemage.org>
+	* CONFIGURE, BUILD, INSTALL: add support for extra packages
+
 2008-07-19 Treeve Jelbert <treeve at sourcemage.org>
 	* PRE_BUILD: deleted, not needed, even by devel version
 	* CONFIGURE, DEPENDS: change qt4  -> qt. 
diff --git a/devel/lazarus/INSTALL b/devel/lazarus/INSTALL
index 3a0b577..953bcd3 100755
--- a/devel/lazarus/INSTALL
+++ b/devel/lazarus/INSTALL
@@ -1 +1,7 @@
-make install INSTALL_PREFIX=${INSTALL_ROOT}/usr FPC=fpc
+make install INSTALL_PREFIX=${INSTALL_ROOT}/usr FPC=fpc  &&
+CFG=$INSTALL_ROOT/etc/lazarus                            &&
+install -m 755 -d $CFG                                   &&
+#mkdir -p $CFG                                            &&
+for FF in idemake.cfg  packagefiles.xml  staticpackages.inc;do
+ install_config_file $FF $CFG/$FF
+done



More information about the SM-Commit mailing list