Skip to content

Fix the Tycho products build #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bio7 merged 3 commits into from
Apr 27, 2025
Merged

Fix the Tycho products build #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7578cf
Fix bin.includes value(s) [bin/] do not match any files.
Mailaender Apr 27, 2025
3ce60d0
Build products with Tycho.
Mailaender Apr 27, 2025
b17ecfa
Fix missing dependencies.
Mailaender Apr 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Bundled_R/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ bin.includes = META-INF/,\
src/,\
.classpath,\
build.properties,\
bin/,\
R/,\
.
1 change: 0 additions & 1 deletion com.eco.bio7.WorldWind/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ bin.includes = META-INF/,\
build.properties,\
.settings/,\
.classpath,\
bin/,\
swt-grouplayout.jar,\
baseline.jar,\
epl-v10.html,\
Expand Down
1 change: 1 addition & 0 deletions com.eco.bio7.aggregator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,6 @@
<module>../com.eco.bio7.util.feature</module>
<module>../com.eco.bio7.WorldWind</module>
<module>../com.eco.bio7.worldwind.feature</module>
<module>../com.eco.bio7.product</module>
</modules>
</project>
1 change: 0 additions & 1 deletion com.eco.bio7.browser/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ bin.includes = plugin.xml,\
pics/,\
baseline.jar,\
swt-grouplayout.jar,\
bin/,\
epl-v10.html,\
icons/,\
.
Expand Down
2 changes: 0 additions & 2 deletions com.eco.bio7.edit/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ bin.includes = plugin.xml,\
icons/,\
templates/,\
src/,\
bin/,\
plugin.properties,\
build.properties,\
about.html,\
Expand All @@ -13,6 +12,5 @@ bin.includes = plugin.xml,\
.

src.includes = about.html,\
bin/,\
icons/,\
epl-v10.html
1 change: 0 additions & 1 deletion com.eco.bio7.floweditor/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ bin.includes = .,\
META-INF/,\
icons/,\
logo.gif,\
bin/,\
epl-v10.html,\
.

1 change: 0 additions & 1 deletion com.eco.bio7.ijmacro.editor/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ bin.includes = plugin.xml,\
.classpath,\
epl-v10.html,\
.settings/,\
bin/,\
libs/,\
libs/antlr-runtime-4.13.1.jar,\
.
2 changes: 0 additions & 2 deletions com.eco.bio7.image/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@ bin.includes = META-INF/,\
bild.gif,\
about.jpg,\
luts/,\
IJ_Prefs.txt,\
baseline.jar,\
swt-grouplayout.jar,\
IJ_Props.txt,\
.FBCLockFolder/,\
.settings/,\
src/,\
bin/,\
epl-v10.html,\
commons-io-1.4.jar,\
plugins/,\
Expand Down
1 change: 0 additions & 1 deletion com.eco.bio7.javaedit/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
templates/,\
bin/,\
plugin.properties,\
build.properties,\
about.html,\
Expand Down
1 change: 0 additions & 1 deletion com.eco.bio7.libs/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ bin.includes = .classpath,\
META-INF/,\
OpenOffice/,\
R/,\
bin/,\
data/,\
pdfjs/,\
physics/,\
Expand Down
1 change: 0 additions & 1 deletion com.eco.bio7.markdownedit/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
icons/,\
bin/,\
src/,\
build.properties,\
.settings/,\
Expand Down
3 changes: 1 addition & 2 deletions com.eco.bio7.os/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
bin.includes = META-INF/,\
src/,\
bin/,\
build.properties,\
.settings/,\
.classpath,\
lib/,\
.classpath,\
libpty.dylib,\
.

12 changes: 12 additions & 0 deletions com.eco.bio7.product/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.eco.bio7.product</name>
<comment>
</comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
1 change: 0 additions & 1 deletion com.eco.bio7/Bio7.product → com.eco.bio7.product/Bio7.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ jdk/bin/javaw.exe
<feature id="org.eclipse.jdt"/>
<feature id="com.eco.bio7.ijmacroedit.feature" installMode="root"/>
<feature id="com.eco.bio7.javacv.feature" installMode="root"/>
<feature id="com.eco.bio7.deepcv.feature" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature" installMode="root"/>
<feature id="org.eclipse.texlipse.main" installMode="root"/>
Expand Down
22 changes: 9 additions & 13 deletions com.eco.bio7/Bio7Prod.product → com.eco.bio7.product/Bio7Prod.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<aboutInfo>
<image path="icons/bio7app/bio7_48.png"/>
<text>
Bio7 - An Integrated Development Environment for Ecological Modeling

Developer: M. Austenfeld

For more information about Bio7 visit the website:

http://bio7.org

Bio7 - An Integrated Development Environment for Ecological Modeling
Developer: M. Austenfeld
For more information about Bio7 visit the website:
http://bio7.org
-----------------------------------------------------------
</text>
</aboutInfo>
Expand Down Expand Up @@ -52,13 +52,12 @@ http://bio7.org
<plugin id="com.eco.bio7.image"/>
<plugin id="com.eco.bio7.javacv"/>
<plugin id="com.eco.bio7.javaedit"/>
<plugin id="com.eco.bio7.jfxswt"/>
<plugin id="com.eco.bio7.libs"/>
<plugin id="com.eco.bio7.markdownedit"/>
<plugin id="com.eco.bio7.os"/>
<plugin id="com.eco.bio7.pythonedit"/>
<plugin id="org.eclipse.texlipse"/>
<plugin id="com.eco.bio7.redit"/>
<plugin id="com.eco.bio7.scenebuilder"/>
<plugin id="com.eco.bio7.themes"/>
<plugin id="com.eco.bio7.util"/>
<plugin id="com.google.gson"/>
Expand All @@ -71,7 +70,6 @@ http://bio7.org
<plugin id="jakarta.annotation-api"/>
<plugin id="jakarta.inject.jakarta.inject-api"/>
<plugin id="jaxen"/>
<plugin id="net.sourceforge.texlipse"/>
<plugin id="org.apache.ant"/>
<plugin id="org.apache.aries.spifly.dynamic.bundle"/>
<plugin id="org.apache.batik.constants"/>
Expand All @@ -80,10 +78,8 @@ http://bio7.org
<plugin id="org.apache.batik.util"/>
<plugin id="org.apache.commons.cli"/>
<plugin id="org.apache.commons.collections"/>
<plugin id="org.apache.commons.commons-beanutils"/>
<plugin id="org.apache.commons.commons-codec"/>
<plugin id="org.apache.commons.commons-io"/>
<plugin id="org.apache.commons.jxpath"/>
<plugin id="org.apache.commons.logging"/>
<plugin id="org.apache.felix.scr"/>
<plugin id="org.apache.httpcomponents.httpcore"/>
Expand Down
32 changes: 16 additions & 16 deletions com.eco.bio7/Bio7Product.product → com.eco.bio7.product/Bio7Product.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<aboutInfo>
<image path="/com.eco.bio7/icons/bio7app/bio7_48.png"/>
<text>
Bio7 - An Integrated Development Environment for Ecological Modeling

Developer: M. Austenfeld

For more information about Bio7 visit the website:

http://bio7.org

Bio7 - An Integrated Development Environment for Ecological Modeling
Developer: M. Austenfeld
For more information about Bio7 visit the website:
http://bio7.org
-----------------------------------------------------------
</text>
</aboutInfo>
Expand All @@ -24,23 +24,23 @@ http://bio7.org
<launcherArgs>
<programArgs>-clearPersistedState
</programArgs>
<programArgsLin>-vm
jdk/bin/java
--launcher.GTK_version
<programArgsLin>-vm
jdk/bin/java
--launcher.GTK_version
2
</programArgsLin>
<programArgsMac>-vm
<programArgsMac>-vm
../MacOS/jdk/Contents/Home/lib/libjli.dylib
</programArgsMac>
<programArgsWin>-vm
<programArgsWin>-vm
jdk/bin/javaw.exe
</programArgsWin>
<vmArgs>-Xms1024m -Xmx4096m -Dprism.lcdtext=false -Dosgi.framework.extensions=org.eclipse.wst.jsdt.nashorn.extension -Dpython.console.encoding=UTF-8 -Dswt.enable.themedScrollBar=true
</vmArgs>
<vmArgsLin>-DJAVAFX_LIBS_PATH=${eclipse_home}/jdk/javafx/lib
</vmArgsLin>
<vmArgsMac>-XstartOnFirstThread
-Dprism.order=sw
<vmArgsMac>-XstartOnFirstThread
-Dprism.order=sw
-DJAVAFX_LIBS_PATH=${eclipse_home}/jdk/javafx/lib
</vmArgsMac>
<vmArgsWin>-DJAVAFX_LIBS_PATH=${eclipse_home}\jdk\javafx\lib
Expand Down Expand Up @@ -197,7 +197,7 @@ jdk/bin/javaw.exe
<feature id="org.eclipse.ecf.filetransfer.feature"/>
<feature id="org.eclipse.ecf.core.feature"/>
<feature id="com.eco.bio7.themes.feature" installMode="root"/>
<feature id="net.sourceforge.texlipse" installMode="root"/>
<feature id="org.eclipse.texlipse.main" installMode="root"/>
<feature id="com.eco.bio7.markdownedit.feature" installMode="root"/>
<feature id="org.eclipse.equinox.p2.core.feature"/>
<feature id="org.eclipse.equinox.p2.rcp.feature"/>
Expand Down
1 change: 0 additions & 1 deletion com.eco.bio7.pythonedit/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ bin.includes = plugin.xml,\
icons/,\
templates/,\
build.properties,\
bin/,\
.classpath,\
.

3 changes: 1 addition & 2 deletions com.eco.bio7.redit/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ bin.includes = plugin.xml,\
META-INF/,\
templates/,\
src/,\
bin/,\
plugin.properties,\
build.properties,\
about.html,\
Expand All @@ -16,4 +15,4 @@ bin.includes = plugin.xml,\
store/,\
uitexts.properties,\
libs/

17 changes: 0 additions & 17 deletions com.eco.bio7.redit/target/generated-sources/antlr4/com/eco/bio7/reditor/antlr/.gitignore
View file
Open in desktop

This file was deleted.

30 changes: 30 additions & 0 deletions com.eco.bio7.targetplatform/com.eco.bio7.targetplatform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,36 @@
<unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
<unit id="org.eclipse.wst.common.snippets" version="0.0.0"/>
<unit id="org.apache.httpcomponents.httpcore" version="0.0.0"/>
<unit id="ch.qos.logback.classic" version="0.0.0"/>
<unit id="ch.qos.logback.core" version="0.0.0"/>
<unit id="com.google.gson" version="0.0.0"/>
<unit id="com.google.guava" version="0.0.0"/>
<unit id="com.google.guava.failureaccess" version="0.0.0"/>
<unit id="org.apache.commons.cli" version="0.0.0"/>
<unit id="org.apache.commons.collections" version="0.0.0"/>
<unit id="org.apache.xerces" version="0.0.0"/>
<unit id="org.apache.xml.resolver" version="0.0.0"/>
<unit id="org.eclipse.emf.ecore.edit" version="0.0.0"/>
<unit id="org.eclipse.m2e.archetype.catalog" version="0.0.0"/>
<unit id="org.eclipse.m2e.archetype.common" version="0.0.0"/>
<unit id="org.eclipse.m2e.archetype.descriptor" version="0.0.0"/>
<unit id="org.eclipse.m2e.archetype.maven-artifact-transfer" version="0.0.0"/>
<unit id="org.eclipse.m2e.core" version="0.0.0"/>
<unit id="org.eclipse.m2e.core.ui" version="0.0.0"/>
<unit id="org.eclipse.m2e.logback" version="0.0.0"/>
<unit id="org.eclipse.m2e.maven.runtime" version="0.0.0"/>
<unit id="org.eclipse.m2e.model.edit" version="0.0.0"/>
<unit id="org.eclipse.m2e.workspace.cli" version="0.0.0"/>
<unit id="org.eclipse.wst.common.core" version="0.0.0"/>
<unit id="org.eclipse.wst.common.emf" version="0.0.0"/>
<unit id="org.eclipse.wst.common.environment" version="0.0.0"/>
<unit id="org.eclipse.wst.common.frameworks" version="0.0.0"/>
<unit id="org.eclipse.wst.common.uriresolver" version="0.0.0"/>
<unit id="org.eclipse.wst.sse.core" version="0.0.0"/>
<unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
<unit id="org.hamcrest.core" version="0.0.0"/>
<unit id="org.jdom" version="0.0.0"/>
<unit id="org.jdom2" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2025-03/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
Expand Down
4 changes: 1 addition & 3 deletions com.eco.bio7.util/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ bin.includes = META-INF/,\
build.properties,\
epl-v10.html,\
src/,\
util/,\
bin/
util/
src.includes = util/,\
epl-v10.html,\
src/,\
build.properties,\
bin/,\
META-INF/,\
.settings/,\
.classpath
5 changes: 1 addition & 4 deletions com.eco.bio7/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
bin.includes = bin/,\
libs/,\
bin.includes = libs/,\
.classpath,\
.project,\
.settings/,\
.pmd,\
.DS_Store,\
Bio7.product,\
Bio7.ini,\
META-INF/,\
baseline.jar,\
Expand Down