* pkgs/strategoxt/pkg-build.sh: generic build script for packages

with the standard untar; bootstrap; configure; make; make install
interface.  The script is parameterized with arguments for
configure. That is, all arguments are passed verbatim to
configure.

* asfix-tools, gpp, sc, srts, stratego-front, xtc: Fix expressions
and (trivial) build script for basic strategoxt packages. All
packages are abstracted on subversion revision.

svn path=/nixpkgs/trunk/; revision=319

ChangeLog

@@ -0,0 +1,12 @@
+2003-08-18  Eelco Visser  <visser@cs.uu.nl>
+
+	* pkgs/strategoxt/pkg-build.sh: generic build script for packages
+	with the standard untar; bootstrap; configure; make; make install
+	interface.  The script is parameterized with arguments for
+	configure. That is, all arguments are passed verbatim to
+	configure.
+
+	* asfix-tools, gpp, sc, srts, stratego-front, xtc: Fix expressions
+	and (trivial) build script for basic strategoxt packages. All
+	packages are abstracted on subversion revision.
+

pkgs/asfix-tools/asfix-tools-build.sh

@@ -0,0 +1,3 @@
+#! /bin/sh
+set -e
+$pkgbuild --with-aterm=$aterm --with-sdf=$sdf2 --with-srts=$srts --with-xtc=$xtc

pkgs/asfix-tools/asfix-tools.fix

@@ -0,0 +1,19 @@
+Function(["rev"],
+  Package(
+    [ ("name", "asfix-tools")
+
+    , ("build", Relative("asfix-tools/asfix-tools-build.sh"))
+    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
+
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", "asfix-tools"), ("rev",  Var("rev"))]))
+
+    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+    , ("aterm",  IncludeFix("aterm/aterm.fix"))
+    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
+    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
+    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
+    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
+    ]
+  )
+)

pkgs/autoxt/autoxt-build.sh

@@ -1,18 +1,3 @@
 #! /bin/sh
-
-. $stdenv/setup || exit 1
-
-echo "out: $out"
-echo "pwd: `pwd`"
-echo "src: $src"
-ls $src
-
-cp -r $src autoxt
-ls
-
-cd autoxt || exit 1
-./bootstrap || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-
+set -e
+$pkgbuild

pkgs/autoxt/autoxt.fix

@@ -2,13 +2,10 @@ Function(["rev"],
   Package(
     [ ("name", "autoxt")
 
-    , ("build", Relative("autoxt/autoxt-build.sh"))
+    , ("build", Relative("strategoxt/pkg-build.sh"))
 
-    , ("src", App(IncludeFix("fetchsvn/fetchsvn.fix"),
-        [ ("url",  "http://losser.st-lab.cs.uu.nl:12080/repos/StrategoXT/trunk/StrategoXT/autoxt")
-        , ("name", "autoxt")
-        , ("rev",  Var("rev"))
-        ]))
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", "autoxt"), ("rev",  Var("rev"))]))
 
     , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
     ]

pkgs/gpp/gpp-build.sh

@@ -0,0 +1,4 @@
+#! /bin/sh
+set -e
+$pkgbuild --with-aterm=$aterm --with-sdf=$sdf2 --with-srts=$srts --with-xtc=$xtc \
+    --with-stratego-front=$stratego_front

pkgs/gpp/gpp.fix

@@ -0,0 +1,21 @@
+Function(["rev"],
+  Package(
+    [ ("name", "gpp")
+
+    , ("build", Relative("gpp/gpp-build.sh"))
+    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
+
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", "gpp"), ("rev",  Var("rev"))]))
+
+    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+    , ("aterm",  IncludeFix("aterm/aterm.fix"))
+    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
+    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
+    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
+    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
+    , ("stratego_front",    
+	App(IncludeFix("stratego-front/stratego-front.fix"),[("rev",Var("rev"))]))
+    ]
+  )
+)

pkgs/sc/sc-build.sh

@@ -0,0 +1,3 @@
+#! /bin/sh
+set -e
+$pkgbuild --with-aterm=$aterm --with-sdf=$sdf2 --with-srts=$srts --with-xtc=$xtc

pkgs/sc/sc.fix

@@ -0,0 +1,19 @@
+Function(["rev"],
+  Package(
+    [ ("name", "sc")
+
+    , ("build", Relative("sc/sc-build.sh"))
+    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
+
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", "sc"), ("rev",  Var("rev"))]))
+
+    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+    , ("aterm",  IncludeFix("aterm/aterm.fix"))
+    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
+    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
+    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
+    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
+    ]
+  )
+)

pkgs/srts/srts-build.sh

@@ -1,22 +1,3 @@
 #! /bin/sh
-
 set -e
-
-. $stdenv/setup
-
-export PATH=$autoxt/bin:$PATH
-
-echo "out: $out"
-echo "pwd: `pwd`"
-echo "src: $src"
-ls $src
-
-cp -r $src srts
-ls
-
-cd srts
-./bootstrap
-./configure --prefix=$out --with-aterm=$aterm
-make
-make install
-
+$pkgbuild --with-aterm=$aterm

pkgs/srts/srts.fix

@@ -3,13 +3,10 @@ Function(["rev"],
     [ ("name", "srts")
 
     , ("build", Relative("srts/srts-build.sh"))
+    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
 
-    , ("src", App(IncludeFix("fetchsvn/fetchsvn.fix"),
-        [ ("url",  "http://losser.st-lab.cs.uu.nl:12080/repos/StrategoXT/trunk/StrategoXT/srts")
-        , ("name", "srts")
-        , ("rev",  Var("rev"))
-        ])
-      )
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", "srts"), ("rev",  Var("rev"))]))
 
     , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
     , ("aterm",  IncludeFix("aterm/aterm.fix"))

pkgs/stratego-front/stratego-front-build.sh

@@ -0,0 +1,5 @@
+#! /bin/sh
+set -e
+$pkgbuild --with-aterm=$aterm --with-sdf=$sdf2 --with-srts=$srts --with-xtc=$xtc
+
+$xtc/bin/xtc -r $(REPOSITORY) import

pkgs/stratego-front/stratego-front.fix

@@ -0,0 +1,19 @@
+Function(["rev"],
+  Package(
+    [ ("name", "stratego-front")
+
+    , ("build", Relative("stratego-front/stratego-front-build.sh"))
+    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
+
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", "stratego-front"), ("rev",  Var("rev"))]))
+
+    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+    , ("aterm",  IncludeFix("aterm/aterm.fix"))
+    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
+    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
+    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
+    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
+    ]
+  )
+)

pkgs/strategoxt/fetchsvn.fix

@@ -0,0 +1,8 @@
+Function(["name", "rev"],
+  App(IncludeFix("fetchsvn/fetchsvn.fix"),
+      [ ("name", Var("name"))
+      , ("url",  "http://losser.labs.cs.uu.nl:12080/repos/StrategoXT/trunk/StrategoXT")
+      , ("dir",  Var("name"))
+      , ("rev",  Var("rev"))
+      ])
+)

pkgs/strategoxt/pkg-build.sh

@@ -0,0 +1,21 @@
+#! /bin/sh
+
+set -e
+
+export NIX_LDFLAGS=-Wl,-s
+
+. $stdenv/setup
+
+export PATH=$autoxt/bin:$PATH
+
+ls -l
+pwd
+
+gtar zxf $src/$name.tar.gz
+
+cd $name
+./bootstrap
+./configure --prefix=$out $*
+make
+make install
+

pkgs/strategoxt/pkg.fix

@@ -0,0 +1,16 @@
+Function(["name","rev"],
+  Package(
+    [ ("name", Var("name"))
+
+    , ("build", Relative("pkg/pkg-build.sh"))
+
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", Var("name")), ("rev",  Var("rev"))]))
+
+    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+    , ("aterm",  IncludeFix("aterm/aterm.fix"))
+    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
+    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
+    ]
+  )
+)

pkgs/strategoxt/sdf-import-build.sh

@@ -0,0 +1,3 @@
+#! /bin/sh -v
+set -e
+$pkgbuild --with-aterm=$aterm --with-xtc=$xtc --with-sdf=$sdf2

pkgs/strategoxt/sdf-import.fix

@@ -0,0 +1,18 @@
+Function(["rev"],
+  Package(
+    [ ("name", "sdf-import")
+
+    , ("build", Relative("strategoxt/sdf-import-build.sh"))
+    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
+
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", "sdf-import"), ("rev",  Var("rev"))]))
+
+    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+    , ("aterm",  IncludeFix("aterm/aterm.fix"))
+    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
+    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
+    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
+    ]
+  )
+)

pkgs/strategoxt/strategoxt-head.fix

@@ -1,4 +1,4 @@
 App(
   IncludeFix("strategoxt/strategoxt.fix")
-  , [("rev", "3385")]
+  , [("rev", "3395")]
 )

pkgs/strategoxt/strategoxt.fix

@@ -2,15 +2,35 @@ Function(["rev"],
   Package(
     [ ("name", "strategoxt")
 
-    , ("build",     Relative("system/populate-linkdirs.pl"))
+    , ("build", Relative("system/populate-linkdirs.pl"))
 
-    , ("actAterm",  IncludeFix("aterm/aterm.fix"))
+    , ("act-sdf2",  
+	IncludeFix("sdf2/sdf2.fix"))
 
-    , ("actAutoxt", App(IncludeFix("autoxt/autoxt.fix"), [("rev",Var("rev"))]))
+    , ("act-autoxt", 
+	App(IncludeFix("autoxt/autoxt.fix"), [("rev",Var("rev"))]))
 
-    , ("actSrts",   App(IncludeFix("srts/srts.fix"), [("rev", Var("rev"))]))
+    , ("act-srts",   
+	App(IncludeFix("srts/srts.fix"), [("rev", Var("rev"))]))
+
+    , ("act-xtc",    
+	App(IncludeFix("xtc/xtc.fix"),[("rev", Var("rev"))]))
+
+    , ("act-sdf-import",    
+	App(IncludeFix("strategoxt/sdf-import.fix"),[("rev", Var("rev"))]))
+
+    , ("act-stratego-front",
+	App(IncludeFix("stratego-front/stratego-front.fix"),[("rev", Var("rev"))]))
+
+    , ("act-asfix-tools",    
+	App(IncludeFix("asfix-tools/asfix-tools.fix"),[("rev", Var("rev"))]))
+
+    , ("act-sc",    
+	App(IncludeFix("sc/sc.fix"),[("rev", Var("rev"))]))
+
+    , ("act-gpp",    
+	App(IncludeFix("gpp/gpp.fix"),[("rev", Var("rev"))]))
 
-    , ("actXtc",    App(IncludeFix("xtc/xtc.fix"),[("rev", Var("rev"))])) 
     ]
   )
 )

pkgs/xtc/xtc-build.sh

@@ -1,14 +1,3 @@
 #! /bin/sh
-
 set -e
-
-. $stdenv/setup 
-
-export PATH=$autoxt/bin:$PATH
-
-cp -r $src $name
-cd $name
-./bootstrap
-./configure --prefix=$out --with-aterm=$aterm --with-srts=$srts
-make
-make install
+$pkgbuild --with-aterm=$aterm --with-srts=$srts

pkgs/xtc/xtc.fix

@@ -3,13 +3,10 @@ Function(["rev"],
     [ ("name", "xtc")
 
     , ("build", Relative("xtc/xtc-build.sh"))
+    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
 
-    , ("src", App(IncludeFix("fetchsvn/fetchsvn.fix"),
-        [ ("url",  "http://losser.st-lab.cs.uu.nl:12080/repos/StrategoXT/trunk/StrategoXT/xtc")
-        , ("name", "xtc")
-        , ("rev",  Var("rev"))
-        ])
-      )
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", "xtc"), ("rev",  Var("rev"))]))
 
     , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
     , ("aterm",  IncludeFix("aterm/aterm.fix"))