equal
deleted
inserted
replaced
161 |
161 |
162 File.append(Components.components(dir), |
162 File.append(Components.components(dir), |
163 terminate_lines("#bundled components" :: |
163 terminate_lines("#bundled components" :: |
164 (for { |
164 (for { |
165 (catalog, bundled) <- catalogs.iterator |
165 (catalog, bundled) <- catalogs.iterator |
166 val path = Components.admin(dir) + Path.basic(catalog) |
166 path = Components.admin(dir) + Path.basic(catalog) |
167 if path.is_file |
167 if path.is_file |
168 line <- split_lines(File.read(path)) |
168 line <- split_lines(File.read(path)) |
169 if line.nonEmpty && !line.startsWith("#") && !line.startsWith("jedit_build") |
169 if line.nonEmpty && !line.startsWith("#") && !line.startsWith("jedit_build") |
170 } yield bundled(line)).toList)) |
170 } yield bundled(line)).toList)) |
171 } |
171 } |
194 line match { |
194 line match { |
195 case Bundled(name) => |
195 case Bundled(name) => |
196 if (Components.check_dir(Components.contrib(dir, name))) Some(contrib_name(name)) |
196 if (Components.check_dir(Components.contrib(dir, name))) Some(contrib_name(name)) |
197 else None |
197 else None |
198 case _ => if (Bundled.detect(line)) None else Some(line) |
198 case _ => if (Bundled.detect(line)) None else Some(line) |
199 }) ::: more_names.map(contrib_name(_))) |
199 }) ::: more_names.map(contrib_name)) |
200 } |
200 } |
201 |
201 |
202 def make_contrib(dir: Path) |
202 def make_contrib(dir: Path) |
203 { |
203 { |
204 Isabelle_System.mkdirs(Components.contrib(dir)) |
204 Isabelle_System.mkdirs(Components.contrib(dir)) |
426 /* make application bundles */ |
426 /* make application bundles */ |
427 |
427 |
428 val bundle_infos = platform_families.map(release.bundle_info) |
428 val bundle_infos = platform_families.map(release.bundle_info) |
429 |
429 |
430 for (bundle_info <- bundle_infos) { |
430 for (bundle_info <- bundle_infos) { |
431 val bundle_archive = release.dist_dir + bundle_info.path |
|
432 val isabelle_name = release.dist_name |
431 val isabelle_name = release.dist_name |
433 val platform = bundle_info.platform |
432 val platform = bundle_info.platform |
434 |
433 |
435 progress.echo("\nApplication bundle for " + platform) |
434 progress.echo("\nApplication bundle for " + platform) |
436 |
435 |