1
1
#! /bin/bash
2
2
3
- # NetBeans 12.4 FCS
4
- REV=21726744165c946ba6619bff89e98d5863f26e22
5
- ZIPNAME=nb124_platform_` date " +%d%m%Y" `
3
+ # NetBeans 14 FCS
4
+ REV=c4f2d87113e1a2d2d4e21e8952e1f99612d5b3fd
5
+ BRANCH=release140
6
+ BUILD_DATE=` git log -n1 --date=format:' %d%m%Y' $0 | fgrep ' Date' | awk ' {print $2}' `
7
+ ZIPNAME=nb140_platform_$BUILD_DATE
6
8
7
9
set -e
8
10
9
11
mkdir -p build/nb/
10
12
cd build/nb/
11
13
BUILD_ROOT=` pwd`
14
+ if [ -e $BUILD_ROOT /$ZIPNAME .zip ]; then
15
+ echo " $BUILD_ROOT /$ZIPNAME .zip is upto date"
16
+ exit
17
+ fi
12
18
if [ -e netbeans ]; then
13
19
cd netbeans
14
20
git fetch
21
+ git clean -fdx
15
22
else
16
23
git clone https://github.com/apache/netbeans netbeans
17
24
cd netbeans
18
25
fi
19
26
20
- git checkout -f $REV
21
- git cherry-pick -n da5d804660a142b2ce96b570ad7a40436e1859c1
22
- git apply - << 'EOF '
23
- diff --git a/platform/libs.jna.platform/external/binaries-list b/platform/libs.jna.platform/external/binaries-list
24
- index 9acffb010f..0b881e49bd 100644
25
- --- a/platform/libs.jna.platform/external/binaries-list
26
- +++ b/platform/libs.jna.platform/external/binaries-list
27
- @@ -15,4 +15,4 @@
28
- # specific language governing permissions and limitations
29
- # under the License.
30
-
31
- -C535A5BDA553D7D7690356C825010DA74B2671B5 net.java.dev.jna:jna-platform:5.9.0
32
- +FBED7D9669DBA47714AD0D4F4454290A997AEE69 net.java.dev.jna:jna-platform:5.10.0
33
- diff --git a/platform/libs.jna.platform/external/jna-platform-5.9.0-license.txt b/platform/libs.jna.platform/external/jna-platform-5.10.0-license.txt
34
- similarity index 99%
35
- rename from platform/libs.jna.platform/external/jna-platform-5.9.0-license.txt
36
- rename to platform/libs.jna.platform/external/jna-platform-5.10.0-license.txt
37
- index 7ab5d5838b..93f6f38469 100644
38
- --- a/platform/libs.jna.platform/external/jna-platform-5.9.0-license.txt
39
- +++ b/platform/libs.jna.platform/external/jna-platform-5.10.0-license.txt
40
- @@ -1,5 +1,5 @@
41
- Name: Java Native Access
42
- -Version: 5.9.0
43
- +Version: 5.10.0
44
- License: Apache-2.0
45
- Description: Dynamically access native libraries from Java without JNI.
46
- Origin: Java Native Access
47
- diff --git a/platform/libs.jna.platform/nbproject/project.properties b/platform/libs.jna.platform/nbproject/project.properties
48
- index b86335082c..247f130b0b 100644
49
- --- a/platform/libs.jna.platform/nbproject/project.properties
50
- +++ b/platform/libs.jna.platform/nbproject/project.properties
51
- @@ -17,5 +17,5 @@
52
-
53
- is.autoload=true
54
- javac.source=1.6
55
- -release.external/jna-platform-5.9.0.jar=modules/ext/jna-platform-5.9.0.jar
56
- +release.external/jna-platform-5.10.0.jar=modules/ext/jna-platform-5.10.0.jar
57
- sigtest.gen.fail.on.error=false
58
- diff --git a/platform/libs.jna.platform/nbproject/project.xml b/platform/libs.jna.platform/nbproject/project.xml
59
- index c7fc274277..07d114bf37 100644
60
- --- a/platform/libs.jna.platform/nbproject/project.xml
61
- +++ b/platform/libs.jna.platform/nbproject/project.xml
62
- @@ -47,8 +47,8 @@
63
- <package>com.sun.jna.platform.wince</package>
64
- </public-packages>
65
- <class-path-extension>
66
- - <runtime-relative-path>ext/jna-platform-5.9.0.jar</runtime-relative-path>
67
- - <binary-origin>external/jna-platform-5.9.0.jar</binary-origin>
68
- + <runtime-relative-path>ext/jna-platform-5.10.0.jar</runtime-relative-path>
69
- + <binary-origin>external/jna-platform-5.10.0.jar</binary-origin>
70
- </class-path-extension>
71
- </data>
72
- </configuration>
73
- diff --git a/platform/libs.jna/external/binaries-list b/platform/libs.jna/external/binaries-list
74
- index ab565afa1b..47981ab434 100644
75
- --- a/platform/libs.jna/external/binaries-list
76
- +++ b/platform/libs.jna/external/binaries-list
77
- @@ -15,4 +15,4 @@
78
- # specific language governing permissions and limitations
79
- # under the License.
80
-
81
- -8F503E6D9B500CEFF299052D6BE75B38C7257758 net.java.dev.jna:jna:5.9.0
82
- +7CF4C87DD802DB50721DB66947AA237D7AD09418 net.java.dev.jna:jna:5.10.0
83
- diff --git a/platform/libs.jna/external/jna-5.9.0-license.txt b/platform/libs.jna/external/jna-5.10.0-license.txt
84
- similarity index 99%
85
- rename from platform/libs.jna/external/jna-5.9.0-license.txt
86
- rename to platform/libs.jna/external/jna-5.10.0-license.txt
87
- index 7ab5d5838b..93f6f38469 100644
88
- --- a/platform/libs.jna/external/jna-5.9.0-license.txt
89
- +++ b/platform/libs.jna/external/jna-5.10.0-license.txt
90
- @@ -1,5 +1,5 @@
91
- Name: Java Native Access
92
- -Version: 5.9.0
93
- +Version: 5.10.0
94
- License: Apache-2.0
95
- Description: Dynamically access native libraries from Java without JNI.
96
- Origin: Java Native Access
97
- diff --git a/platform/libs.jna/manifest.mf b/platform/libs.jna/manifest.mf
98
- index 268c326a7f..dfc5d87c52 100644
99
- --- a/platform/libs.jna/manifest.mf
100
- +++ b/platform/libs.jna/manifest.mf
101
- @@ -4,4 +4,4 @@ OpenIDE-Module: org.netbeans.libs.jna/2
102
- OpenIDE-Module-Install: org/netbeans/libs/jna/Installer.class
103
- OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jna/Bundle.properties
104
- AutoUpdate-Essential-Module: true
105
- -OpenIDE-Module-Specification-Version: 2.7
106
- +OpenIDE-Module-Specification-Version: 2.9
107
- diff --git a/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig b/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig
108
- index 2fda185287..a5ad4f21b8 100644
109
- --- a/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig
110
- +++ b/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig
111
- @@ -269,7 +269,7 @@ fld public final static int POINTER_SIZE
112
- fld public final static int SIZE_T_SIZE
113
- fld public final static int WCHAR_SIZE
114
- fld public final static java.lang.String DEFAULT_ENCODING
115
- -fld public final static java.lang.String VERSION = "5.9.0"
116
- +fld public final static java.lang.String VERSION = "5.10.0"
117
- fld public final static java.lang.String VERSION_NATIVE = "6.1.1"
118
- fld public final static java.nio.charset.Charset DEFAULT_CHARSET
119
- innr public abstract interface static ffi_callback
120
- diff --git a/platform/libs.jna/nbproject/project.properties b/platform/libs.jna/nbproject/project.properties
121
- index a7efb245d5..4d01926a66 100644
122
- --- a/platform/libs.jna/nbproject/project.properties
123
- +++ b/platform/libs.jna/nbproject/project.properties
124
- @@ -16,16 +16,16 @@
125
- # under the License.
126
-
127
- javac.source=1.6
128
- -release.external/jna-5.9.0.jar=modules/ext/jna-5.9.0.jar
129
- +release.external/jna-5.10.0.jar=modules/ext/jna-5.10.0.jar
130
- # Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
131
- -release.external/jna-5.9.0.jar!/com/sun/jna/darwin-x86-64/libjnidispatch.jnilib=modules/lib/x86_64/libjnidispatch-nb.jnilib
132
- -release.external/jna-5.9.0.jar!/com/sun/jna/darwin-aarch64/libjnidispatch.jnilib=modules/lib/aarch64/libjnidispatch-nb.jnilib
133
- -release.external/jna-5.9.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-nb.so
134
- -release.external/jna-5.9.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-nb.so
135
- -release.external/jna-5.9.0.jar!/com/sun/jna/linux-aarch64/libjnidispatch.so=modules/lib/aarch64/linux/libjnidispatch-nb.so
136
- -release.external/jna-5.9.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-nb.dll
137
- -release.external/jna-5.9.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-nb.dll
138
- -release.external/jna-5.9.0.jar!/com/sun/jna/win32-aarch64/jnidispatch.dll=modules/lib/aarch64/jnidispatch-nb.dll
139
- +release.external/jna-5.10.0.jar!/com/sun/jna/darwin-x86-64/libjnidispatch.jnilib=modules/lib/x86_64/libjnidispatch-nb.jnilib
140
- +release.external/jna-5.10.0.jar!/com/sun/jna/darwin-aarch64/libjnidispatch.jnilib=modules/lib/aarch64/libjnidispatch-nb.jnilib
141
- +release.external/jna-5.10.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-nb.so
142
- +release.external/jna-5.10.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-nb.so
143
- +release.external/jna-5.10.0.jar!/com/sun/jna/linux-aarch64/libjnidispatch.so=modules/lib/aarch64/linux/libjnidispatch-nb.so
144
- +release.external/jna-5.10.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-nb.dll
145
- +release.external/jna-5.10.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-nb.dll
146
- +release.external/jna-5.10.0.jar!/com/sun/jna/win32-aarch64/jnidispatch.dll=modules/lib/aarch64/jnidispatch-nb.dll
147
- jnlp.verify.excludes=\
148
- modules/lib/amd64/jnidispatch-nb.dll,\
149
- modules/lib/x86/jnidispatch-nb.dll,\
150
- diff --git a/platform/libs.jna/nbproject/project.xml b/platform/libs.jna/nbproject/project.xml
151
- index b72dff6ae4..20f5f4e84f 100644
152
- --- a/platform/libs.jna/nbproject/project.xml
153
- +++ b/platform/libs.jna/nbproject/project.xml
154
- @@ -48,8 +48,8 @@
155
- <package>com.sun.jna.win32</package>
156
- </public-packages>
157
- <class-path-extension>
158
- - <runtime-relative-path>ext/jna-5.9.0.jar</runtime-relative-path>
159
- - <binary-origin>external/jna-5.9.0.jar</binary-origin>
160
- + <runtime-relative-path>ext/jna-5.10.0.jar</runtime-relative-path>
161
- + <binary-origin>external/jna-5.10.0.jar</binary-origin>
162
- </class-path-extension>
163
- </data>
164
- </configuration>
165
- EOF
27
+ git checkout $BRANCH
28
+ git reset --hard $REV
29
+ git cherry-pick -n -Xignore-all-space --strategy-option=theirs c6166f56bdefe2dee663b5bb26de86219e4c04ff
30
+ git restore --staged platform
166
31
patch -p1 << 'EOF '
167
32
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties
168
33
index 4d1dbb762b..8f2630e25e 100644
@@ -213,18 +78,29 @@ index 4adfc32095..7712a2f8b3 100644
213
78
if (bgColor.getAlpha() > 0) {
214
79
double circPosX = (width - d) / 2.0;
215
80
diff --git a/nbbuild/build.properties b/nbbuild/build.properties
216
- index 759f93abb5..b20e00f1a2 100644
81
+ index 08dab861c9..9b967d5e92 100644
217
82
--- a/nbbuild/build.properties
218
83
+++ b/nbbuild/build.properties
219
- @@ -133 ,7 +133 ,6 @@ config.javadoc.stable=\
84
+ @@ -134 ,7 +134 ,6 @@ config.javadoc.stable=\
220
85
api.debugger.jpda,\
221
86
project.ant,\
222
87
project.ant.ui,\
223
88
- api.visual,\
224
89
api.java,\
225
90
api.java.classpath,\
226
91
api.search,\
227
- @@ -167,7 +166,6 @@ config.javadoc.devel=\
92
+ @@ -155,9 +154,7 @@ config.javadoc.stable=\
93
+ db.core,\
94
+ spi.quicksearch,\
95
+ print,\
96
+ - extexecution,\
97
+ - lib.uihandler,\
98
+ - uihandler
99
+ + extexecution
100
+
101
+ #FIXME: changes for retouche merge:
102
+ # editor/codetemplates,\
103
+ @@ -168,7 +165,6 @@ config.javadoc.devel=\
228
104
jellytools.platform,\
229
105
jellytools.ide,\
230
106
core.multitabs,\
@@ -233,18 +109,10 @@ index 759f93abb5..b20e00f1a2 100644
233
109
gradle.java,\
234
110
o.n.swing.outline,\
235
111
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
236
- index ae56c143d4..2919799d01 100644
112
+ index ec87c9719b..4573ebdb9b 100644
237
113
--- a/nbbuild/cluster.properties
238
114
+++ b/nbbuild/cluster.properties
239
- @@ -206,7 +206,6 @@ nb.cluster.platform=\
240
- api.scripting,\
241
- api.search,\
242
- api.templates,\
243
- - api.visual,\
244
- applemenu,\
245
- autoupdate.cli,\
246
- autoupdate.services,\
247
- @@ -217,24 +216,19 @@ nb.cluster.platform=\
115
+ @@ -217,25 +217,18 @@ nb.cluster.platform=\
248
116
core.multitabs,\
249
117
core.multiview,\
250
118
core.nativeaccess,\
@@ -257,45 +125,74 @@ index ae56c143d4..2919799d01 100644
257
125
editor.mimelookup,\
258
126
editor.mimelookup.impl,\
259
127
favorites,\
128
+ - htmlui,\
260
129
- janitor,\
261
130
javahelp,\
262
131
junitlib,\
263
132
keyring,\
264
133
keyring.fallback,\
265
134
keyring.impl,\
266
- lib.uihandler,\
135
+ - lib.uihandler,\
267
136
- libs.batik.read,\
268
137
- libs.felix,\
269
138
libs.flatlaf,\
270
139
libs.javafx,\
271
140
libs.jna,\
272
- @@ -242 ,7 +236,6 @@ nb.cluster.platform=\
141
+ @@ -243 ,7 +236,6 @@ nb.cluster.platform=\
273
142
libs.jsr223,\
274
143
libs.junit4,\
275
144
libs.junit5,\
276
145
- libs.osgi,\
277
146
libs.testng,\
278
147
masterfs,\
279
148
masterfs.linux,\
280
- @@ -257,10 +250,6 @@ nb.cluster.platform=\
281
- net.java.html.geo,\
149
+ @@ -254,19 +246,8 @@ nb.cluster.platform=\
150
+ net.java.html,\
151
+ net.java.html.boot,\
152
+ net.java.html.boot.fx,\
153
+ - net.java.html.boot.script,\
154
+ - net.java.html.geo,\
282
155
net.java.html.json,\
283
- net.java.html.sound,\
156
+ - net.java.html.sound,\
284
157
- netbinox,\
285
158
- o.apache.commons.codec,\
286
159
- o.apache.commons.io,\
160
+ - o.apache.commons.lang3,\
287
161
- o.apache.commons.logging,\
288
162
o.n.core,\
289
- o.n.html.ko4j,\
290
- o.n.html.xhr4j,\
291
- @@ -284,7 +273,6 @@ nb.cluster.platform=\
163
+ - o.n.html.ko4j,\
164
+ - o.n.html.presenters.spi,\
165
+ - o.n.html.xhr4j,\
166
+ o.n.swing.laf.dark,\
167
+ o.n.swing.laf.flatlaf,\
168
+ o.n.swing.outline,\
169
+ @@ -277,16 +258,13 @@ nb.cluster.platform=\
170
+ openide.compat,\
171
+ openide.dialogs,\
172
+ openide.execution,\
173
+ - openide.execution.compat8,\
174
+ openide.explorer,\
175
+ - openide.filesystems.compat8,\
176
+ openide.filesystems.nb,\
177
+ openide.io,\
178
+ openide.loaders,\
179
+ openide.nodes,\
292
180
openide.options,\
293
181
openide.text,\
294
- openide.util.enumerations,\
295
182
- openide.util.ui.svg,\
296
183
openide.windows,\
297
184
options.api,\
298
185
options.keymap,\
186
+ @@ -299,8 +277,7 @@ nb.cluster.platform=\
187
+ spi.actions,\
188
+ spi.quicksearch,\
189
+ templates,\
190
+ - templatesui,\
191
+ - uihandler
192
+ + templatesui
193
+ validation.nb.cluster.platform=\
194
+ o.n.core,\
195
+ core.windows,\
299
196
diff --git a/harness/apisupport.harness/nbproject/project.properties b/harness/apisupport.harness/nbproject/project.properties
300
197
index 7db6d57275..4b8b94fa03 100644
301
198
--- a/harness/apisupport.harness/nbproject/project.properties
@@ -361,14 +258,10 @@ EOF
361
258
git status
362
259
363
260
OPTS=-Dbuild.compiler.debuglevel=source,lines
364
- SHORT_REV=` git rev-parse --short HEAD`
365
261
366
262
git clean -fdX
367
263
cd nbbuild
368
- ant $OPTS -Dname=platform -Dhg.id= $SHORT_REV rebuild-cluster
369
- ant $OPTS -Dname=harness -Dhg.id= $SHORT_REV rebuild-cluster
264
+ ant $OPTS -Dname=platform rebuild-cluster
265
+ ant $OPTS -Dname=harness rebuild-cluster
370
266
371
267
zip -r $BUILD_ROOT /$ZIPNAME .zip netbeans
372
-
373
- rm -rf netbeans
374
- unzip $BUILD_ROOT /$ZIPNAME .zip
0 commit comments