changeset 12:18c28b2b2f10

Merge.
author Mikhail Kryshen <mikhail@kryshen.net>
date Tue, 24 Mar 2009 15:11:22 +0300
parents 6a5132431379 14fb708ebd3e
children ac5f1bc82b13
files dist/tema
diffstat 4 files changed, 17 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/.hgignore	Sat Mar 07 19:02:36 2009 +0300
     1.2 +++ b/.hgignore	Tue Mar 24 15:11:22 2009 +0300
     1.3 @@ -5,5 +5,5 @@
     1.4  doc/manual/manual.html
     1.5  dist/*.jar
     1.6  dist/*.tar.gz
     1.7 +dist/tema
     1.8  nbproject/private
     1.9 -
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/compile-native	Tue Mar 24 15:11:22 2009 +0300
     2.3 @@ -0,0 +1,13 @@
     2.4 +#!/bin/sh
     2.5 +#
     2.6 +# Compile Tema to native code using GCJ.
     2.7 +#
     2.8 +
     2.9 +ant compile
    2.10 +
    2.11 +compile_classes=$(find build -name '*.class' | grep -v tema/ant)
    2.12 +
    2.13 +gcj -o build/demo.template.o -c --resource kryshen/tema/demo/demo.template build/kryshen/tema/demo/demo.template
    2.14 +gcj -g --main=kryshen.tema.Tema -o dist/tema dist/lib/commons-cli-1.1.jar $compile_classes build/demo.template.o
    2.15 +
    2.16 +rm build/demo.template.o
     3.1 --- a/dist/tema	Sat Mar 07 19:02:36 2009 +0300
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,3 +0,0 @@
     3.4 -#!/bin/sh
     3.5 -
     3.6 -java -jar tema.jar "$@"
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/dist/tema.sh	Tue Mar 24 15:11:22 2009 +0300
     4.3 @@ -0,0 +1,3 @@
     4.4 +#!/bin/sh
     4.5 +
     4.6 +java -jar tema.jar "$@"