From 6928b915354fa1831045d1b5b9aa32263852890e Mon Sep 17 00:00:00 2001 From: Andreas Reischuck Date: Thu, 27 Nov 2014 21:44:39 +0100 Subject: [PATCH 1/2] fixed windows build again --- vendor/SourceMap.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vendor/SourceMap.pro b/vendor/SourceMap.pro index 8c2135a..90d3acc 100644 --- a/vendor/SourceMap.pro +++ b/vendor/SourceMap.pro @@ -44,4 +44,5 @@ compiler_clean.commands = -$(DEL_FILE) $$shell_path($$TARGET_NAME/Makefile) prepareBuild.depends = makeBuildFolder buildInstall.depends = prepareBuild install.depends = $(DESTDIR_TARGET) $(TARGET) -QMAKE_EXTRA_TARGETS += makeBuildFolder prepareBuild buildInstall install compiler_clean +empty.target = $(TARGET) +QMAKE_EXTRA_TARGETS += makeBuildFolder prepareBuild buildInstall install compiler_clean empty From 31ff458a1dac7e7638c5cc80d22ad304cbf4db93 Mon Sep 17 00:00:00 2001 From: Andreas Reischuck Date: Sun, 14 Dec 2014 00:19:37 +0100 Subject: [PATCH 2/2] updated SourceMap and Readme --- CHANGES | 4 ++++ README.md | 18 ++++++++++-------- vendor/SourceMap | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 501d5bc..817c88d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +Changes for 1.0.2 (released 2014-12-14): + * fixed Windows build again + * improved Readme + Changes for 1.0.1 (released 2014-11-27): * fixed Linux build * code style improvements diff --git a/README.md b/README.md index 7a2e683..8e26492 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,13 @@ We also have a purely Javascript based implementation for NodeJS. * more difficult than regular html. It requires tight controls about every whitespace and tools for indentation. * often requires more control structures in order to access models or AST-like structures. -We faced this question and Twofold is the result. +We faced these challanges and Twofold is the result. ## Features * indentation handling * source maps for generated javascript - * javascript exeptions and syntax errors will point into your template + * javascript exceptions and syntax errors will point into your template * nested source maps for generated targets * positions of all the calls that lead to any target character * control of every generated line and every whitespace @@ -26,10 +26,12 @@ We faced this question and Twofold is the result. ## Requirements * C++11 compiler - * Tested with GCC 4.8.2 on MinGW - * Tested with Visual Studio 2013 November CTP Compiler -* Qt 5.3.x - * Tested with the binary distributions of Qt 5.3.2 on Windows + * Tested with GCC 4.9.1 on MinGW + * Tested with Visual Studio 2013 Community Edition Compiler (use jom) + * Other compilers might work, but are not currently tested +* Qt 5.4.x + * Tested with the binary distributions of Qt 5.4.0 on Windows + * Other Qt versions might work, but are not currently tested ## How does it work? @@ -45,7 +47,7 @@ Twofold is basically Javascript that is extended with constructs to generate sou These control characters have to be the first non-whitespace character on each line. Every whitespace before them is ignored. -Every whitespace after is used as the indentation. Indentation is cumulative and added to each outputted line. +Every whitespace after is used as the indentation. Indentation is cumulative and added to each generated line. **Hint:** Use the whitespaces before control characters to indent them in a column deeper than any surrounding javascript. This gives you a visual splitter. @@ -133,7 +135,7 @@ Twofold is simple. We find it very useful as it is. } ```` -* please add an issue +* feel free to add your wish as an issue ## License diff --git a/vendor/SourceMap b/vendor/SourceMap index e199a2e..40ca442 160000 --- a/vendor/SourceMap +++ b/vendor/SourceMap @@ -1 +1 @@ -Subproject commit e199a2ec94ad113de4dd6a009cf6960fe3d83f8c +Subproject commit 40ca442975784ebf3a937a4348ef6aaee88e2555