-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
subrepo: subdir: "framework" merged: "5c04938ccf" upstream: origin: "[email protected]:daisy/pipeline-framework.git" branch: "master" commit: "152158e8e7" git-subrepo: version: "0.3.1" origin: "???" commit: "???"
- Loading branch information
Showing
45 changed files
with
1,469 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,6 @@ | |
| [subrepo] | ||
| remote = [email protected]:daisy/pipeline-framework.git | ||
| branch = master | ||
| commit = e97e38124f1c8b446f27e4d05f5b434358144f55 | ||
| parent = 0e4ac3656cd5011b8557e9dcfa4894fc3ff6d17d | ||
| commit = 152158e8e7af8754a5b161bac0739420dba6acbf | ||
| parent = 577cf702adde53ef7b284740dfe7509f25e81951 | ||
| cmdver = 0.3.1 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| include make/enable-java-shell.mk | ||
|
|
||
| PIPELINE1_VERSION := 20250106 | ||
|
|
||
| dependencies : src/main/resources/pipeline-$(PIPELINE1_VERSION).jar \ | ||
| src/main/resources/org.daisy.util-$(PIPELINE1_VERSION).jar | ||
|
|
||
| src/main/resources/pipeline-20230619.zip : | ||
| mkdirs("$(dir $@)"); \ | ||
| copy(new URL("https://github.com/daisy/pipeline1/releases/download/v20230619/$(notdir $@)"), \ | ||
| new File("$@")); | ||
|
|
||
| src/main/resources/pipeline-$(PIPELINE1_VERSION).jar : src/main/resources/pipeline-$(PIPELINE1_VERSION).zip | ||
| rm(new File("$@")); \ | ||
| copy(new URL("jar:file:$(CURDIR)/$<!/$(patsubst %.zip,%,$(notdir $<))/pipeline.jar"), \ | ||
| new File("$@")); | ||
|
|
||
| src/main/resources/org.daisy.util-$(PIPELINE1_VERSION).jar : src/main/resources/pipeline-$(PIPELINE1_VERSION).zip | ||
| rm(new File("$@")); \ | ||
| copy(new URL("jar:file:$(CURDIR)/$<!/$(patsubst %.zip,%,$(notdir $<))/lib/org.daisy.util.jar"), \ | ||
| new File("$@")); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| /recipes/ | ||
| .DS_Store |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| ifneq ($(firstword $(sort $(MAKE_VERSION) 3.82)), 3.82) | ||
| $(error "GNU Make 3.82 is required to run this script") | ||
| endif | ||
|
|
||
| ifeq ($(OS),Windows_NT) | ||
| SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/windows_amd64/eval-java.exe | ||
| else | ||
| UNAME_S := $(shell uname -s) | ||
| UNAME_P := $(shell uname -p) | ||
| ifeq ($(UNAME_S),Darwin) | ||
| ifneq ($(filter arm%,$(UNAME_P))$(filter aarch%,$(UNAME_P)),) | ||
| SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/darwin_arm64/eval-java | ||
| else | ||
| SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/darwin_amd64/eval-java | ||
| endif | ||
| else | ||
| ifeq ($(UNAME_S),Linux) | ||
| ifneq ($(filter arm%,$(UNAME_P))$(filter aarch%,$(UNAME_P)),) | ||
| SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/linux_arm64/eval-java | ||
| else | ||
| SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/linux_amd64/eval-java | ||
| endif | ||
| else | ||
| SHELL := $(dir $(lastword $(MAKEFILE_LIST)))bin/windows_amd64/eval-java.exe | ||
| endif | ||
| endif | ||
| endif | ||
| .SHELLFLAGS := | ||
|
|
||
| JAVA_VERSION := $(shell println(getJavaVersion());) | ||
|
|
||
| ifeq ($(JAVA_VERSION),) | ||
| # probably because java not found or exited with a UnsupportedClassVersionError | ||
| $(error "Java 8 is required to run this script") | ||
| else ifeq ($(shell println($(JAVA_VERSION) >= 8);), false) | ||
| $(error "Java 8 is required to run this script") | ||
| endif | ||
|
|
||
| OS := $(shell println(getOS());) |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
|
|
||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.daisy.pipeline</groupId> | ||
| <artifactId>framework-parent</artifactId> | ||
| <version>1.15.1-SNAPSHOT</version> | ||
| <relativePath>../parent/</relativePath> | ||
| </parent> | ||
|
|
||
| <groupId>org.daisy.pipeline</groupId> | ||
| <artifactId>pipeline1-adapter</artifactId> | ||
| <version>1.0.1-SNAPSHOT</version> | ||
| <packaging>bundle</packaging> | ||
|
|
||
| <name>DAISY Pipeline 2 :: Pipeline 1 backend</name> | ||
|
|
||
| <properties> | ||
| <pipeline1.version>20250106</pipeline1.version> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.daisy.pipeline</groupId> | ||
| <artifactId>common-utils</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.daisy.pipeline</groupId> | ||
| <artifactId>framework-core</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.github.bmuskalla</groupId> | ||
| <artifactId>scoped-system-properties</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.osgi</groupId> | ||
| <artifactId>org.osgi.compendium</artifactId> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.daisy.pipeline</groupId> | ||
| <artifactId>ds-to-spi-runtime</artifactId> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.daisy.pipeline</groupId> | ||
| <artifactId>ds-to-spi-annotations</artifactId> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.daisy</groupId> | ||
| <artifactId>pipeline</artifactId> | ||
| <version>${pipeline1.version}</version> | ||
| <scope>system</scope> | ||
| <systemPath>${project.basedir}/src/main/resources/pipeline-${pipeline1.version}.jar</systemPath> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.daisy</groupId> | ||
| <artifactId>org.daisy.util</artifactId> | ||
| <version>${pipeline1.version}</version> | ||
| <scope>system</scope> | ||
| <systemPath>${project.basedir}/src/main/resources/org.daisy.util-${pipeline1.version}.jar</systemPath> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <resources> | ||
| <resource> | ||
| <directory>src/main/resources</directory> | ||
| <excludes> | ||
| <exclude>maven.properties</exclude> | ||
| <exclude>pipeline-*.zip</exclude> | ||
| <exclude>pipeline-*.jar</exclude> | ||
| <exclude>org.daisy.util-*.jar</exclude> | ||
| </excludes> | ||
| </resource> | ||
| <resource> | ||
| <directory>src/main/resources</directory> | ||
| <filtering>true</filtering> | ||
| <includes> | ||
| <include>maven.properties</include> | ||
| </includes> | ||
| </resource> | ||
| <resource> | ||
| <directory>${project.build.directory}/generated-resources/pipeline1</directory> | ||
| </resource> | ||
| </resources> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-antrun-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <phase>generate-resources</phase> | ||
| <configuration> | ||
| <tasks> | ||
| <exec executable="make" failonerror="true"> | ||
| <arg value="src/main/resources/pipeline-${pipeline1.version}.zip" /> | ||
| </exec> | ||
| <unzip src="src/main/resources/pipeline-${pipeline1.version}.zip" dest="${project.build.directory}/generated-resources/pipeline1"> | ||
| <patternset> | ||
| <exclude name="pipeline-${pipeline1.version}/pipeline.sh" /> | ||
| <exclude name="pipeline-${pipeline1.version}/pipeline.bat" /> | ||
| <exclude name="pipeline-${pipeline1.version}/pipeline.user.properties" /> | ||
| <exclude name="pipeline-${pipeline1.version}/licenses/**" /> | ||
| <exclude name="pipeline-${pipeline1.version}/rmi/**" /> | ||
| <exclude name="pipeline-${pipeline1.version}/transformers/**" /> | ||
| </patternset> | ||
| <cutdirsmapper dirs="1" /> | ||
| </unzip> | ||
| <unzip src="src/main/resources/pipeline-${pipeline1.version}.zip" dest="${project.build.directory}/tmp/unzip-pipeline-${pipeline1.version}/"> | ||
| <patternset> | ||
| <include name="pipeline-${pipeline1.version}/transformers/**" /> | ||
| </patternset> | ||
| <cutdirsmapper dirs="1" /> | ||
| </unzip> | ||
| <jar destfile="${project.build.directory}/generated-resources/pipeline1/transformers.jar" basedir="${project.build.directory}/tmp/unzip-pipeline-${pipeline1.version}/transformers" /> | ||
| <delete dir="${project.build.directory}/tmp/unzip-pipeline-${pipeline1.version}" /> | ||
| </tasks> | ||
| </configuration> | ||
| <goals> | ||
| <goal>run</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.daisy.pipeline.build</groupId> | ||
| <artifactId>ds-to-spi-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>generate-spi-classes</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>generate-spi-classes</goal> | ||
| </goals> | ||
| <configuration> | ||
| <includes> | ||
| org.daisy.pipeline.pipeline1.impl.Pipeline1ScriptProvider | ||
| </includes> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <configuration> | ||
| <instructions> | ||
| <_dsannotations> | ||
| org.daisy.pipeline.pipeline1.impl.Pipeline1ScriptProvider | ||
| </_dsannotations> | ||
| <Import-Package> | ||
| !org.daisy.common.spi, | ||
| !org.daisy.common.spi.annotations, | ||
| * | ||
| </Import-Package> | ||
| </instructions> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
Oops, something went wrong.