summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar mszulecki2007-02-26 02:28:05 +0000
committerGravatar mszulecki2007-02-26 02:28:05 +0000
commit09f526cd1dc150b10db6439d2f1dbb0d3107060c (patch)
tree0ce421c2f8555463e4ff97518ef07274046d4625
parentde41ac9f6d7d3ee046719d69adf504b02ead30a2 (diff)
downloaddskel-09f526cd1dc150b10db6439d2f1dbb0d3107060c.tar.gz
dskel-09f526cd1dc150b10db6439d2f1dbb0d3107060c.tar.bz2
Add gdc version to config.d and show it in helloworld.
git-svn-id: http://svn.sukimashita.com/repos/dskel/trunk@17 4281df72-ff29-0410-8fee-2d9ac0c5f5a7
-rw-r--r--config.d.in1
-rw-r--r--configure.ac3
-rw-r--r--src/catalog.d2
-rwxr-xr-xsrc/helloworld.d2
4 files changed, 6 insertions, 2 deletions
diff --git a/config.d.in b/config.d.in
index 0e84400..da86825 100644
--- a/config.d.in
+++ b/config.d.in
@@ -9,3 +9,4 @@ s PACKAGE_STRING = "@PACKAGE_STRING@";
s PACKAGE_TARNAME = "@PACKAGE_TARNAME@";
s VERSION = "@VERSION@";
s GDC = "@GDC@";
+s GDC_VERSION = "@GDC_VERSION@";
diff --git a/configure.ac b/configure.ac
index c2e6daa..396ca93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ if test "x$GDC" = "xno"; then
fi
AC_SUBST(GDC)
+AC_SUBST(GDC_VERSION,[$($GDC --version | grep -P -o "(?<=\()gdc (.*?)(?=,)")])
AC_SUBST(DFLAGS, "-g -O2")
dnl TODO: Check for Phobos Library
@@ -50,5 +51,5 @@ echo ""
echo "Configuration summary"
echo ""
echo " * Installation prefix = $prefix"
-echo " * D compiler: $GDC"
+echo " * D compiler: $GDC_VERSION - $GDC"
echo ""
diff --git a/src/catalog.d b/src/catalog.d
index ff48a58..fd60545 100644
--- a/src/catalog.d
+++ b/src/catalog.d
@@ -2,7 +2,7 @@ module catalog;
public static class Catalog
{
- public static void Init(char[] p, char[] localedir)
+ public static void Init(char[] packageid, char[] localedir)
{
}
diff --git a/src/helloworld.d b/src/helloworld.d
index 05ed01b..db25741 100755
--- a/src/helloworld.d
+++ b/src/helloworld.d
@@ -13,6 +13,8 @@ void main(char[][] args)
writefln(HelloWorldFactory.getName() ~ ", " ~ HelloWorldSharedObjectFactory.getVersion() ~ " " ~ config.VERSION);
+ writefln("Compiled using: " ~ config.GDC_VERSION);
+
// auto type inference and built-in foreach
foreach (argc, argv; args)
{