Browse code

Merge branch 'master' of zucker:fs-workbench

Fenris Wolf authored on17/04/2017 12:01:48
Showing0 changed files
Fenris Wolf authored on17/04/2017 12:01:43
Showing1 changed files
... ...
@@ -26,8 +26,16 @@
26 26
 		</mkdir>
27 27
 		<concat destfile="build/model.js">
28 28
 			<filelist dir=".">
29
+				<file name="source/model/concept.js">
30
+				</file>
31
+				<file name="source/model/wordfragment.js">
32
+				</file>
29 33
 				<file name="source/model/word.js">
30 34
 				</file>
35
+				<file name="source/model/translation.js">
36
+				</file>
37
+				<file name="source/model/transition.js">
38
+				</file>
31 39
 			</filelist>
32 40
 		</concat>
33 41
 	</target>
Browse code

added encoding attribute to make sure UTF-8 encoding is used for the resulting concatenated files since some (why only some is miraculous) of the concatenated files otherwise are encoded with ANSI which leads to character corruption for characters not found in ANSI

Raymund Zacharias authored on29/05/2016 15:44:56
Showing1 changed files
... ...
@@ -1,6 +1,7 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
1 2
 <project name="fs-workbench" default="build">
2 3
 	<target name="build" depends="build-base,build-model,build-test">
3
-		<concat destfile="build/workbench.js">
4
+		<concat destfile="build/workbench.js"  encoding="UTF-8">
4 5
 			<filelist dir=".">
5 6
 				<file name="build/base.js">
6 7
 				</file>
... ...
@@ -14,7 +15,7 @@
14 15
 	<target name="build-base">
15 16
 		<mkdir dir="build">
16 17
 		</mkdir>
17
-		<concat destfile="build/base.js">
18
+		<concat destfile="build/base.js"  encoding="UTF-8">
18 19
 			<filelist dir=".">
19 20
 				<file name="source/base.js">
20 21
 				</file>
... ...
@@ -24,7 +25,7 @@
24 25
 	<target name="build-model">
25 26
 		<mkdir dir="build">
26 27
 		</mkdir>
27
-		<concat destfile="build/model.js">
28
+		<concat destfile="build/model.js"  encoding="UTF-8">
28 29
 			<filelist dir=".">
29 30
 				<file name="source/model/word.js">
30 31
 				</file>
... ...
@@ -34,7 +35,7 @@
34 35
 	<target name="build-test">
35 36
 		<mkdir dir="build">
36 37
 		</mkdir>
37
-		<concat destfile="build/test.js">
38
+		<concat destfile="build/test.js" encoding="UTF-8">
38 39
 			<filelist dir=".">
39 40
 				<file name="source/test.js">
40 41
 				</file>
Browse code

added small test

fenris authored on28/05/2016 19:59:16
Showing1 changed files
... ...
@@ -1,5 +1,27 @@
1 1
 <project name="fs-workbench" default="build">
2
-	<target name="build">
2
+	<target name="build" depends="build-base,build-model,build-test">
3
+		<concat destfile="build/workbench.js">
4
+			<filelist dir=".">
5
+				<file name="build/base.js">
6
+				</file>
7
+				<file name="build/model.js">
8
+				</file>
9
+				<file name="build/test.js">
10
+				</file>
11
+			</filelist>
12
+		</concat>
13
+	</target>
14
+	<target name="build-base">
15
+		<mkdir dir="build">
16
+		</mkdir>
17
+		<concat destfile="build/base.js">
18
+			<filelist dir=".">
19
+				<file name="source/base.js">
20
+				</file>
21
+			</filelist>
22
+		</concat>
23
+	</target>
24
+	<target name="build-model">
3 25
 		<mkdir dir="build">
4 26
 		</mkdir>
5 27
 		<concat destfile="build/model.js">
... ...
@@ -9,4 +31,14 @@
9 31
 			</filelist>
10 32
 		</concat>
11 33
 	</target>
34
+	<target name="build-test">
35
+		<mkdir dir="build">
36
+		</mkdir>
37
+		<concat destfile="build/test.js">
38
+			<filelist dir=".">
39
+				<file name="source/test.js">
40
+				</file>
41
+			</filelist>
42
+		</concat>
43
+	</target>
12 44
 </project>
Browse code

added class 'word'

fenris authored on28/05/2016 19:43:20
Showing1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,12 @@
1
+<project name="fs-workbench" default="build">
2
+	<target name="build">
3
+		<mkdir dir="build">
4
+		</mkdir>
5
+		<concat destfile="build/model.js">
6
+			<filelist dir=".">
7
+				<file name="source/model/word.js">
8
+				</file>
9
+			</filelist>
10
+		</concat>
11
+	</target>
12
+</project>