Skip to content

Commit

Permalink
Build WebDSL with latest strategoxt.jar from Spoofax distribution.
Browse files Browse the repository at this point in the history
Remove build dependencies on strc-java and java-front Nix packages (no longer available from Hydra buildfarm).
Add java-front SDF files to project since these are not provided by Spoofax distribution.
Remove xml-front dependency, not in Spoofax and only used to generate web.xml, replaced with simple String template.
Remove unused SDF files related to Python and CSS code generation.
Remove XML from combined Stratego-WebDSL-Java parser.
Some fixes required due to switch from strc-java's CSGLR to strategoxt.jar's JSGLR parser.
Remove unused makefile components for generating C code, enable-java-backend option no longer required.

svn path=/webdsls/trunk/; revision=6073
  • Loading branch information
dgroenewegen committed May 1, 2015
1 parent 97354f1 commit b6b0799
Show file tree
Hide file tree
Showing 323 changed files with 3,738 additions and 2,206 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Expand Up @@ -41,4 +41,4 @@ CLEANFILES = XTC

ACLOCAL_AMFLAGS = -I.

pkgconfig_DATA = webdsls.pc webdsl.m4
pkgconfig_DATA = webdsls.pc
1 change: 0 additions & 1 deletion bootstrap
Expand Up @@ -11,7 +11,6 @@ else
fi

autoxt || exit 1
auto-java-front || exit 1
aclocal -I . || exit 1
autoreconf -ifv || exit 1
automake -a || exit 1
Expand Down
7 changes: 1 addition & 6 deletions configure.ac
Expand Up @@ -18,7 +18,6 @@ XT_SETUP
XT_PRE_RELEASE

XT_USE_XT_PACKAGES
XT_USE_JAVA_FRONT

## makes the autoconf and svn revision numbers visible through primitives, see stratego sources
XT_TERM_DEFINE
Expand All @@ -32,11 +31,7 @@ AC_PROG_LIBTOOL

AC_CHECK_PROG([bash], [bash], [`type -p bash`], [/bin/bash])

WEBDSLC=$prefix/bin/webdslc

XT_ENABLE_JAVA_BACKEND
XT_ENABLE_WEB_CHECK
XT_USE_STRC_JAVA
WEBDSLC=java

AC_SUBST(WEBDSLC)

Expand Down
3 changes: 3 additions & 0 deletions java-runtime/src/utils/TemplateCall.java
Expand Up @@ -174,6 +174,9 @@ public static void putAttributeMergeClassOrStyle(Map<String,String> attrsmapout,
attrsmapout.put(key, value);
}
}
public static void putAttributeMergeClassOrStyle(Map<String,String> attrsmapout, String key, Integer value){
putAttributeMergeClassOrStyle(attrsmapout, key, value.toString());
}


/*
Expand Down
2 changes: 1 addition & 1 deletion release.nix
Expand Up @@ -55,7 +55,7 @@ let
};

jobs = rec {
tests = pkgs.lib.listToAttrs (map (f: pkgs.lib.nameValuePair (pkgs.lib.replaceChars ["/"] ["_"] f) (run_test f)) (import webtests));
# tests = pkgs.lib.listToAttrs (map (f: pkgs.lib.nameValuePair (pkgs.lib.replaceChars ["/"] ["_"] f) (run_test f)) (import webtests));

tarball =
pkgs.stdenv.mkDerivation {
Expand Down

0 comments on commit b6b0799

Please sign in to comment.