@@ -88,6 +88,7 @@ enum MacBuildApplicationTaskID implements TaskID {
88
88
89
89
enum MacCopyAppImageTaskID implements TaskID {
90
90
COPY_PACKAGE_FILE ,
91
+ COPY_RUNTIME_INFO_PLIST ,
91
92
REPLACE_APP_IMAGE_FILE ,
92
93
COPY_SIGN
93
94
}
@@ -112,7 +113,7 @@ static PackagingPipeline.Builder build(Optional<Package> pkg) {
112
113
.task (CopyAppImageTaskID .COPY )
113
114
.copyAction (MacPackagingPipeline ::copyAppImage ).add ()
114
115
.task (MacBuildApplicationTaskID .RUNTIME_INFO_PLIST )
115
- .applicationAction (MacPackagingPipeline ::writeRuntimeInfoPlist )
116
+ .applicationAction (MacPackagingPipeline ::writeApplicationRuntimeInfoPlist )
116
117
.addDependent (BuildApplicationTaskID .CONTENT ).add ()
117
118
.task (MacBuildApplicationTaskID .COPY_JLILIB )
118
119
.applicationAction (MacPackagingPipeline ::copyJliLib )
@@ -134,6 +135,9 @@ static PackagingPipeline.Builder build(Optional<Package> pkg) {
134
135
.packageAction (MacPackagingPipeline ::writePackageFile )
135
136
.addDependencies (CopyAppImageTaskID .COPY )
136
137
.addDependents (PrimaryTaskID .COPY_APP_IMAGE ).add ()
138
+ .task (MacCopyAppImageTaskID .COPY_RUNTIME_INFO_PLIST )
139
+ .addDependencies (CopyAppImageTaskID .COPY )
140
+ .addDependents (PrimaryTaskID .COPY_APP_IMAGE ).add ()
137
141
.task (MacBuildApplicationTaskID .FA_ICONS )
138
142
.applicationAction (MacPackagingPipeline ::writeFileAssociationIcons )
139
143
.addDependent (BuildApplicationTaskID .CONTENT ).add ()
@@ -173,6 +177,9 @@ static PackagingPipeline.Builder build(Optional<Package> pkg) {
173
177
// don't create ".package" file and don't sign it.
174
178
disabledTasks .add (MacCopyAppImageTaskID .COPY_PACKAGE_FILE );
175
179
disabledTasks .add (MacCopyAppImageTaskID .COPY_SIGN );
180
+ // if (p.isRuntimeInstaller()) {
181
+ // builder.task(MacCopyAppImageTaskID.COPY_RUNTIME_INFO_PLIST).packageAction(MacPackagingPipeline::writeRuntimeRuntimeInfoPlist).add();
182
+ // }
176
183
}
177
184
178
185
for (final var taskId : disabledTasks ) {
@@ -238,22 +245,28 @@ private static void writePkgInfoFile(
238
245
"APPL????" .getBytes (StandardCharsets .ISO_8859_1 ));
239
246
}
240
247
241
- private static void writeRuntimeInfoPlist (
248
+ private static void writeRuntimeRuntimeInfoPlist (PackageBuildEnv <MacPackage , AppImageLayout > env ) throws IOException {
249
+ writeRuntimeInfoPlist (env .pkg ().app (), env .env (), env .resolvedLayout ().rootDirectory ());
250
+ }
251
+
252
+ private static void writeApplicationRuntimeInfoPlist (
242
253
AppImageBuildEnv <MacApplication , MacApplicationLayout > env ) throws IOException {
254
+ writeRuntimeInfoPlist (env .app (), env .env (), env .resolvedLayout ().runtimeRootDirectory ());
255
+ }
243
256
244
- final var app = env . app ();
257
+ private static void writeRuntimeInfoPlist ( MacApplication app , BuildEnv env , Path runtimeRootDirectory ) throws IOException {
245
258
246
259
Map <String , String > data = new HashMap <>();
247
260
data .put ("CF_BUNDLE_IDENTIFIER" , app .bundleIdentifier ());
248
261
data .put ("CF_BUNDLE_NAME" , app .bundleName ());
249
262
data .put ("CF_BUNDLE_VERSION" , app .version ());
250
263
data .put ("CF_BUNDLE_SHORT_VERSION_STRING" , app .shortVersion ().toString ());
251
264
252
- env .env (). createResource ("Runtime-Info.plist.template" )
265
+ env .createResource ("Runtime-Info.plist.template" )
253
266
.setPublicName ("Runtime-Info.plist" )
254
267
.setCategory (I18N .getString ("resource.runtime-info-plist" ))
255
268
.setSubstitutionData (data )
256
- .saveToFile (env . resolvedLayout (). runtimeRootDirectory () .resolve ("Contents/Info.plist" ));
269
+ .saveToFile (runtimeRootDirectory .resolve ("Contents/Info.plist" ));
257
270
}
258
271
259
272
private static void writeAppInfoPlist (
0 commit comments