-
Notifications
You must be signed in to change notification settings - Fork 2
/
zk-osgi.patch
executable file
·130 lines (125 loc) · 2.93 KB
/
zk-osgi.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
diff --git a/build.gradle b/build.gradle
index 112e5fde67..6d60b8a0d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,6 +36,7 @@ ext {
'zcommon' : "$rootDir/zcommon",
'zkwebfragment': "$rootDir/zkwebfragment",
'zul' : "$rootDir/zul",
+/*
'za11y' : "$zkcmlDir/za11y",
'zkex' : "$zkcmlDir/zkex",
'zkmax' : "$zkcmlDir/zkmax",
@@ -44,6 +45,7 @@ ext {
'stateless' : "$zkcmlDir/stateless",
'stateless-immutable': "$zkcmlDir/stateless-immutable",
'client-bind' : "$zkcmlDir/client-bind"
+*/
]
zkcmlprojects = [
'za11y': "$zkcmlDir/za11y",
@@ -147,6 +149,7 @@ subprojects {
toolVersion '10.11.0'
}
+/*
task tscheck(type: NpmTask) {
setOnlyIf { project.ext['gradleFrontendSkip'] == 'false' }
enabled = project.file("tsconfig.json").exists()
@@ -170,10 +173,10 @@ subprojects {
def eslintDir = project.file(".eslintrc.js").exists() ? projectDir : rootDir;
args =['run', 'lint', '--', "$projectDir/$resources/web/js", "--config=$eslintDir/.eslintrc.js", "--ignore-path=$rootDir/.eslintignore", "--fix"]
}
-
+*/
check {
- dependsOn(tscheck)
- dependsOn(jscheck)
+// dependsOn(tscheck)
+// dependsOn(jscheck)
}
// Compile LESS
@@ -321,11 +324,13 @@ subprojects {
}
}
+/*
task tscheck(type: NpmTask) {
setOnlyIf { project.ext['gradleFrontendSkip'] == 'false' }
args =['run', 'type-check']
}
check.dependsOn(tscheck)
+*/
// Version Check
def fileCheck(file, regex) {
@@ -389,4 +394,4 @@ task upVer() {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/settings.gradle b/settings.gradle
index 30fd5fdb1b..2480db3428 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,6 +12,6 @@ include(':zcommon')
include(':zkwebfragment')
include(':zul')
-includeBuild '../zkcml'
+//includeBuild '../zkcml'
includeBuild '../zkthemes'
includeBuild "$rootDir/zksandbox"
diff --git a/tsconfig.json b/tsconfig.json
index f9e0602924..d22fe7d52a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -30,10 +30,12 @@
"zul",
"zhtml",
"zkbind",
+/*
"stateless",
"zkmax",
"zkex",
"client-bind",
+*/
"webpack-env"
],
"paths": {
@@ -45,7 +47,9 @@
],
"@zhtml/*": [
"./zhtml/src/main/resources/web/js/zhtml/*"
- ],
+ ]
+/*
+ ,
"@stateless/*": [
"./stateless/src/main/resources/web/js/stateless/*"
],
@@ -58,14 +62,18 @@
"@client-bind/*": [
"../zkcml/client-bind/src/main/resources/web/js/clientbind/*"
]
+*/
}
},
"include": [
"zk/src/main/resources/web/js",
"zul/src/main/resources/web/js",
"zkbind/src/main/resources/web/js",
- "zhtml/src/main/resources/web/js",
+ "zhtml/src/main/resources/web/js"
+/*
+ ,
"stateless/src/main/resources/web/js"
+*/
],
"exclude": [
"node_modules",
@@ -73,4 +81,4 @@
"**/build/*",
"**/codegen/*"
]
-}
\ No newline at end of file
+}