diff options
| -rw-r--r-- | INSTALL | 236 | ||||
| -rw-r--r-- | Makefile.am | 27 | ||||
| -rwxr-xr-x | autogen.sh | 3 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | po/LINGUAS | 3 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 | ||||
| -rw-r--r-- | po/de.po | 21 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/catalog.d | 19 | ||||
| -rwxr-xr-x | src/helloworld.d | 6 |
10 files changed, 87 insertions, 246 deletions
diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 23e5f25..0000000 --- a/INSTALL +++ /dev/null @@ -1,236 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/Makefile.am b/Makefile.am index 8a2928e..07b4606 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,20 @@ -SUBDIRS = src +SUBDIRS = src po EXTRA_DIST= \ -README \ -INSTALL \ -COPYING \ -config.d.in + AUTHORS \ + README \ + INSTALL \ + COPYING \ + config.d.in \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in \ + mkinstalldirs + +CLEANFILES = \ + intltool-extract \ + intltool-update \ + intltool-merge DISTCLEANFILES = \ configure \ @@ -15,3 +25,10 @@ DISTCLEANFILES = \ aclocal.m4 \ ltmain.sh \ missing + +MAINTAINERCLEANFILES = \ + INSTALL \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in \ + mkinstalldirs @@ -21,5 +21,4 @@ which gnome-autogen.sh || { echo "You need to install gnome-common from the GNOME CVS" exit 1 } -REQUIRED_AUTOMAKE_VERSION=1.7 . gnome-autogen.sh - +REQUIRED_AUTOMAKE_VERSION=1.7 REQUIRED_INTLTOOL_VERSION=0.35 . gnome-autogen.sh diff --git a/configure.ac b/configure.ac index c60a89f..c2e6daa 100644 --- a/configure.ac +++ b/configure.ac @@ -13,6 +13,13 @@ AC_GNU_SOURCE AC_PROG_INSTALL AC_PROG_LIBTOOL +IT_PROG_INTLTOOL([0.35.0]) +AM_GLIB_GNU_GETTEXT +GETTEXT_PACKAGE=$PACKAGE +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext +domain]) + dnl Check for GNU D Compiler AC_PATH_PROG(GDC, "gdc", no) @@ -32,7 +39,8 @@ AC_SUBST(DEPS_LIBS) AC_CONFIG_FILES([ config.d Makefile -src/Makefile +src/Makefile +po/Makefile.in ]) AC_OUTPUT() diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..0eddece --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,3 @@ +# please keep this list sorted alphabetically +# +de diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000..10f182b --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,4 @@ +# List of source files containing translatable strings. +# Please keep this file in alphabetical order. +[encoding: UTF-8] +src/helloworld.d diff --git a/po/de.po b/po/de.po new file mode 100644 index 0000000..6b37cce --- /dev/null +++ b/po/de.po @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-02-23 18:11+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/helloworld.d:12 +msgid "Hello!" +msgstr "Hallo!" diff --git a/src/Makefile.am b/src/Makefile.am index 84f04c3..947351c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,12 +1,12 @@ lib_LTLIBRARIES = libtestshlibrary.la libtestshlibrary_la_SOURCES = testshlibrary.d -libtestshlibrary_la_LDFLAGS = -version-info 0:1:0 -module +libtestshlibrary_la_LDFLAGS = -version-info 0:0:0 -module noinst_LIBRARIES = libtestlibrary.a libtestlibrary_a_SOURCES = testlibrary.d bin_PROGRAMS = helloworld -helloworld_SOURCES = helloworld.d +helloworld_SOURCES = helloworld.d catalog.d helloworld_LDADD = $(DEPS_LIBS) $(top_srcdir)/config.d libtestlibrary.a libtestshlibrary.la helloworld_LINK = $(GDC) $(DFLAGS) -o $@ diff --git a/src/catalog.d b/src/catalog.d new file mode 100644 index 0000000..ff48a58 --- /dev/null +++ b/src/catalog.d @@ -0,0 +1,19 @@ +module catalog; + +public static class Catalog +{ + public static void Init(char[] p, char[] localedir) + { + + } + + public static char[] GetString(char[] s) + { + return s; + } + + public static char[] GetPluralString(char[] s, char[] p, char[] n) + { + return s; + } +} diff --git a/src/helloworld.d b/src/helloworld.d index f2f328b..05ed01b 100755 --- a/src/helloworld.d +++ b/src/helloworld.d @@ -2,9 +2,15 @@ import config; import testlibrary; import testshlibrary; import std.stdio; +import catalog; void main(char[][] args) { + // Internationalization Example + Catalog.Init("i18n","./locale"); + + writefln(Catalog.GetString("Hello!")); + writefln(HelloWorldFactory.getName() ~ ", " ~ HelloWorldSharedObjectFactory.getVersion() ~ " " ~ config.VERSION); // auto type inference and built-in foreach |