Permalink
Browse files

Remove all dependencies on obsolete Stratego/SDF/Aterm Nix packages f…

…rom build.
  • Loading branch information...
dmgroenewegen committed Mar 1, 2016
1 parent d6ecab5 commit 033e6ad9e48a78454b85e3ce8cd7b94d35cb09e3
View
@@ -1,5 +1,3 @@
include $(top_srcdir)/Makefile.xt
# remove the default tar -o option to allow long path names
am__tar = ${AMTAR} chf - "$$tardir"
@@ -40,5 +38,3 @@ EXTRA_DIST = Makefile.xt bootstrap autoxt.m4 java-front.m4 webdsls.pc \
CLEANFILES = XTC
ACLOCAL_AMFLAGS = -I.
pkgconfig_DATA = webdsls.pc
View
@@ -2,15 +2,6 @@
rm -f config.cache config.log acconfig.h aclocal.m4
os=$(uname -s)
if [ "$os" = "Linux" ]; then
libtoolize
else
glibtoolize
fi
autoxt || exit 1
aclocal -I . || exit 1
autoreconf -ifv || exit 1
automake -a || exit 1
View
@@ -11,29 +11,13 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
### DEPENDENCIES ##################################
XT_SETUP
#XT_USE_BOOTSTRAP_XT_PACKAGES
# comment to make this a stable release
XT_PRE_RELEASE
XT_USE_XT_PACKAGES
## makes the autoconf and svn revision numbers visible through primitives, see stratego sources
XT_TERM_DEFINE
AC_PROG_CC
AC_PROG_INSTALL
PKG_PROG_PKG_CONFIG
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_CHECK_PROG([bash], [bash], [`type -p bash`], [/bin/bash])
WEBDSLC=java
AC_SUBST(WEBDSLC)
AM_CONDITIONAL(TEST_MACOSX, [test $(uname -s) = "Darwin"])
AM_CONDITIONAL(TEST_LINUX, [test $(uname -s) = "Linux"])
AM_CONDITIONAL(TEST_WINDOWS, [test $OS = "Windows_NT"])
### OUTPUT ########################################
@@ -46,7 +30,6 @@ src/org/webdsl/dsl/project/webdsl
src/org/webdsl/dsl/project/webdsl-eclipseplugin
src/org/webdsl/dsl/project/webdsl-plugins
src/org/webdsl/dsl/project/Makefile
webdsls.pc
test/run
test/run-test-fail-servlet.sh
test/run-test-fail.sh
View
@@ -1,6 +1,7 @@
include $(top_srcdir)/Makefile.xt
include $(wildcard *.dep)
include $(wildcard org/webdsl/dsl/*/*.dep)
prefix=@prefix@
datarootdir=@datarootdir@
pkgdatadir=@datadir@/@PACKAGE@
sdfdatadir=@datadir@/sdf/@PACKAGE@
### distribution
@@ -24,8 +25,8 @@ FULLCLEANFILES = \
$(wildcard org/webdsl/dsl/*/*/*.def) \
$(wildcard org/webdsl/dsl/*/*.pp.af) \
$(wildcard org/webdsl/dsl/*/*.rtg) \
$(wildcard org/webdsl/dsl/*/*.tbl)\
$(wildcard org/webdsl/dsl/*/*/*.tbl)
$(wildcard org/webdsl/dsl/*/*.tbl) \
$(wildcard org/webdsl/dsl/*/*/*.tbl)
# "make clean" leaves syntax intact; use fullclean/distclean
@@ -161,8 +162,39 @@ STRINCLUDES = -I .\
SDF2RTG_FLAGS = --main `basename $*` --ignore-missing-cons
if TEST_LINUX
NATIVEPATH=`pwd`/share/strategoxt/linux/
endif
if TEST_MACOSX
NATIVEPATH=`pwd`/share/strategoxt/macosx/
endif
NATIVEPATHOPTION=-Xnativepath $(NATIVEPATH)
STRTOOL=java -Xss8m -cp $(STRATEGOXT_JAR) run
GENSDFMIX=$(STRTOOL) org.strategoxt.tools.main-gen-sdf-mix $(NATIVEPATHOPTION)
PACKSDF=$(STRTOOL) org.strategoxt.tools.main-pack-sdf
SDF2TABLE=$(NATIVEPATH)/sdf2table
SDF2RTG=$(STRTOOL) org.strategoxt.tools.main-sdf2rtg $(NATIVEPATHOPTION)
RTG2SIG=$(STRTOOL) org.strategoxt.tools.main-rtg2sig
PARSEPPTABLE=$(STRTOOL) org.strategoxt.tools.main-parse-pp-table
Mix%.sdf : %.def
gen-sdf-mix -i $< --main `basename $*` --name Mix`basename $*` -o $@
$(GENSDFMIX) -i $< --main `basename $*` --name Mix`basename $*` -o $@
%.def : %.sdf
$(PACKSDF) -i $< -o $@ -I share/strategoxt/stratego-front/sdf/
%.tbl : %.def
$(SDF2TABLE) -m `basename $*` -i $< -o $@
%.rtg : %.def
$(SDF2RTG) --main `basename $*` --ignore-missing-cons -i $< -o $@
%.str : %.rtg
$(RTG2SIG) --module `basename $*` -i $< -o $@
%.pp.af : %.pp
$(PARSEPPTABLE) -i $< -o $@
SCFLAGS = --main $*-main
View
@@ -1,6 +1,6 @@
if [ ! -f share/strategoxt/strategoxt/strategoxt.jar ]; then
wget http://artifacts.metaborg.org/service/local/repositories/releases/content/org/metaborg/strategoxt-distrib/1.4.0/strategoxt-distrib-1.4.0-bin.tar
tar -xf strategoxt-distrib-1.4.0-bin.tar
wget http://artifacts.metaborg.org/service/local/repositories/releases/content/org/metaborg/strategoxt-distrib/1.5.0/strategoxt-distrib-1.5.0-bin.tar
tar -xf strategoxt-distrib-1.5.0-bin.tar
fi
if [ ! -f strategoxt.jar ]; then
cp share/strategoxt/strategoxt/strategoxt.jar .
@@ -32,13 +32,13 @@ TESTS = testnewproject.sh
COMPILE_JARS = template-java-servlet/lib/webdsl-support.jar template-java-servlet/lib/webdsl-built-ins.jar
# Note:
# $(filter-out template-java-servlet/lib/webdsl-support.jar,$(WEBDSL_TEMPLATES)) \
# $(filter-out template-java-servlet/lib/webdsl-support.jar,$(WEBDSL_TEMPLATES)) \
# template-java-servlet/lib/webdsl-support.jar \
# is not the same as
# $(WEBDSL_TEMPLATES)
# the latter does not trigger the template-java-servlet/lib/webdsl-support.jar target if it was not build before
nobase_dist_pkgdata_DATA = \
$(filter-out template-java-servlet/lib/webdsl-support.jar,$(WEBDSL_TEMPLATES)) \
$(filter-out template-java-servlet/lib/webdsl-support.jar,$(WEBDSL_TEMPLATES)) \
template-java-servlet/lib/webdsl-support.jar \
webdsl-build.xml \
webdsl-build-command.xml \
@@ -9,4 +9,4 @@ if test -z "$ANT_LOGGER"; then
ANT_LOGGER="org.webdsl.ant.WebDSLAntLogger"
fi
ant -f "${sharewebdsl}/webdsl-build.xml" -Dtemplatedir="${sharewebdsl}" -Dcurrentdir="`pwd`" -Dwebdsl-java-cp="${webdsljar}" -Dstratego-jar-cp="${strategojar}" -Dwebdslexec="@WEBDSLC@" -Dbuildoptions="$*" command -lib "${sharewebdsl}/template-java-servlet/lib/webdsl-support.jar" -logger $ANT_LOGGER
ant -f "${sharewebdsl}/webdsl-build.xml" -Dtemplatedir="${sharewebdsl}" -Dcurrentdir="`pwd`" -Dwebdsl-java-cp="${webdsljar}" -Dstratego-jar-cp="${strategojar}" -Dwebdslexec="java" -Dbuildoptions="$*" command -lib "${sharewebdsl}/template-java-servlet/lib/webdsl-support.jar" -logger $ANT_LOGGER
@@ -8,4 +8,4 @@ if test -z "$ANT_LOGGER"; then
ANT_LOGGER="org.webdsl.ant.WebDSLAntLogger"
fi
ant -f "${sharewebdsl}/webdsl-build.xml" -Dtemplatedir="${sharewebdsl}" -Dcurrentdir="`pwd`" -Dwebdsl-java-cp="${webdsljar}" -Dwebdslexec="@WEBDSLC@" -Dbuildoptions="$*" command -lib "${sharewebdsl}/template-java-servlet/lib/webdsl-support.jar" -logger $ANT_LOGGER
ant -f "${sharewebdsl}/webdsl-build.xml" -Dtemplatedir="${sharewebdsl}" -Dcurrentdir="`pwd`" -Dwebdsl-java-cp="${webdsljar}" -Dwebdslexec="java" -Dbuildoptions="$*" command -lib "${sharewebdsl}/template-java-servlet/lib/webdsl-support.jar" -logger $ANT_LOGGER
View

This file was deleted.

Oops, something went wrong.

0 comments on commit 033e6ad

Please sign in to comment.