Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions releaseScripts/default/adds/UltDelta.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ def check_string_contains(strings, words):
return False


@lru_cache(maxsize=1)
def get_launcher_jar():
candidates = glob.glob(os.path.join(ultimatedir, "plugins", "org.eclipse.equinox.launcher_*.jar"))
if not candidates:
raise RuntimeError("Could not find any launcher JAR.")
if len(candidates) > 1:
raise RuntimeError("Found multiple launcher JARs: " + ", ".join(candidates))
return candidates[0]


def get_binary():
ultimate_bin = [
"java",
Expand All @@ -65,10 +75,7 @@ def get_binary():

ultimate_bin = ultimate_bin + [
"-jar",
os.path.join(
ultimatedir,
"plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar",
),
get_launcher_jar(),
"-data",
datadir,
]
Expand Down
15 changes: 11 additions & 4 deletions releaseScripts/default/adds/Ultimate.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,16 @@ def get_java():
sys.exit(ExitCode.FAIL_NO_JAVA)


@lru_cache(maxsize=1)
def get_launcher_jar():
candidates = glob.glob(os.path.join(ultimatedir, "plugins", "org.eclipse.equinox.launcher_*.jar"))
if not candidates:
raise RuntimeError("Could not find any launcher JAR.")
if len(candidates) > 1:
raise RuntimeError("Found multiple launcher JARs: " + ", ".join(candidates))
return candidates[0]


def create_ultimate_base_call():
ultimate_bin = [
get_java(),
Expand All @@ -290,10 +300,7 @@ def create_ultimate_base_call():

ultimate_bin = ultimate_bin + [
"-jar",
os.path.join(
ultimatedir,
"plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar",
),
get_launcher_jar(),
"-data",
"@noDefault",
"-ultimatedata",
Expand Down
12 changes: 11 additions & 1 deletion releaseScripts/default/adds/reqchecker/run_complete_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -712,14 +712,24 @@ def extract_vacuity_run_z3(args, tmp_smt_filename):
return relevant_lines


@lru_cache(maxsize=1)
def get_launcher_jar():
candidates = glob.glob("plugins/org.eclipse.equinox.launcher_*.jar")
if not candidates:
raise RuntimeError("Could not find any launcher JAR.")
if len(candidates) > 1:
raise RuntimeError("Found multiple launcher JARs: " + ", ".join(candidates))
return candidates[0]


def create_common_ultimate_cli_args(args, toolchain, settings, input_file):
return [
"java",
"-Dosgi.configuration.area=config/",
"-Xmx100G",
"-Xss4m",
"-jar",
"plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar",
get_launcher_jar(),
"-tc",
toolchain,
"-s",
Expand Down
2 changes: 1 addition & 1 deletion releaseScripts/default/adds/run-ultimate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ java \
-Dosgi.configuration.area=config/ \
-Xmx10G \
-Xss4m \
-jar plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar \
-jar plugins/org.eclipse.equinox.launcher_1.7.100.v20251111-0406.jar \
-data config/data \
"$@"
2 changes: 1 addition & 1 deletion releaseScripts/website-config/backend/WebBackend.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-startup
plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar
plugins/org.eclipse.equinox.launcher_1.7.100.v20251111-0406.jar
--launcher.library
plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.2.1500.v20250801-0854
-nosplash
Expand Down
24 changes: 0 additions & 24 deletions trunk/source/BA_FeatureDependenciesCommon/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@
id="com.google.gson"
version="0.0.0"/>

<plugin
id="com.ibm.icu"
version="0.0.0"/>

<plugin
id="com.sun.jna"
version="0.0.0"/>

<plugin
id="com.sun.xml.bind.jaxb-impl"
version="0.0.0"/>
Expand All @@ -34,10 +26,6 @@
id="org.apache.commons.commons-io"
version="0.0.0"/>

<plugin
id="org.apache.commons.logging"
version="0.0.0"/>

<plugin
id="org.apache.log4j"
version="0.0.0"/>
Expand All @@ -46,18 +34,6 @@
id="org.apache.logging.log4j.api"
version="0.0.0"/>

<plugin
id="org.apache.xerces"
version="0.0.0"/>

<plugin
id="org.apache.xml.resolver"
version="0.0.0"/>

<plugin
id="org.apache.xml.serializer"
version="0.0.0"/>

<plugin
id="org.eclipse.cdt.build.gcc.core"
version="0.0.0"/>
Expand Down
10 changes: 1 addition & 9 deletions trunk/source/BA_FeatureDependenciesDebugE4/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
arch="x86_64">

<requires>
<import feature="BA_FeatureDependenciesCommon"/>
<import feature="BA_FeatureUltimateCommon"/>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why all these changes to the feature dependencies (also in other features)?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bahnwaerter changed this in b5bba47, but I don't quite remember why 😉

</requires>

<plugin
Expand Down Expand Up @@ -62,14 +62,6 @@
id="org.apache.commons.commons-jxpath"
version="0.0.0"/>

<plugin
id="org.apache.xalan"
version="0.0.0"/>

<plugin
id="org.apache.xmlgraphics"
version="0.0.0"/>

<plugin
id="org.eclipse.core.databinding"
version="0.0.0"/>
Expand Down
1 change: 0 additions & 1 deletion trunk/source/BA_FeatureUltimateCommandLine/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
arch="x86_64">

<requires>
<import feature="BA_FeatureDependenciesCommon"/>
<import feature="BA_FeatureUltimateCommon"/>
</requires>

Expand Down
10 changes: 2 additions & 8 deletions trunk/source/BA_FeatureUltimateCommon/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@

<plugin
id="de.uni_freiburg.informatik.ultimate.plugins.generator.icfgbuilder"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="de.uni_freiburg.informatik.ultimate.plugins.analysis.lassoranker"
Expand Down Expand Up @@ -184,10 +181,7 @@

<plugin
id="edu.uci.ics.jung"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="de.uni_freiburg.informatik.ultimate.plugins.blockencoding"
Expand Down
7 changes: 1 addition & 6 deletions trunk/source/BA_FeatureUltimateDebug/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

<requires>
<import feature="BA_FeatureDependenciesDebugE4"/>
<import feature="BA_FeatureDependenciesCommon"/>
<import feature="BA_FeatureUltimateCommon"/>
</requires>

<plugin
Expand All @@ -31,9 +29,6 @@

<plugin
id="edu.uci.ics.jung"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

</feature>
11 changes: 1 addition & 10 deletions trunk/source/BA_FeatureUltimateDeltaDebugger/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,11 @@
provider-name="Ultimate Program Analysis Team">

<requires>
<import feature="BA_FeatureDependenciesCommon"/>
<import feature="BA_FeatureUltimateCommon"/>
<import feature="BA_FeatureUltimateCommandLine"/>
</requires>

<plugin
id="de.uni_freiburg.informatik.ultimate.deltadebugger"
version="0.0.0"/>

<plugin
id="de.uni_freiburg.informatik.ultimate.cli"
version="0.0.0"/>

<plugin
id="org.apache.commons.cli"
version="0.0.0"/>

</feature>
2 changes: 1 addition & 1 deletion trunk/source/BA_FeatureWebBackend/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
arch="x86_64">

<requires>
<import feature="BA_FeatureDependenciesCommon" version="0.0.0"/>
<import feature="BA_FeatureUltimateCommon"/>
</requires>

<plugin
Expand Down
14 changes: 7 additions & 7 deletions trunk/source/BA_MavenParentUltimate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@

<!-- maven plugin versions -->
<!-- https://mvnrepository.com/artifact/org.eclipse.tycho/tycho-core -->
<tycho-version>5.0.0</tycho-version>
<tycho-version>5.0.2</tycho-version>
<!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
<sonar-version>5.2.0.4988</sonar-version>
<sonar-version>5.5.0.6356</sonar-version>
<!-- https://mvnrepository.com/artifact/org.jacoco/jacoco-maven-plugin -->
<jacoco-version>0.8.14</jacoco-version>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-clean-plugin -->
<maven-clean-version>3.5.0</maven-clean-version>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-antrun-plugin -->
<maven-antrun-version>3.2.0</maven-antrun-version>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-war-plugin -->
<maven-war-version>3.5.0</maven-war-version>
<maven-war-version>3.5.1</maven-war-version>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-assembly-plugin -->
<maven-assembly-version>3.7.1</maven-assembly-version>
<maven-assembly-version>3.8.0</maven-assembly-version>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-resources-plugin -->
<maven-resources-version>3.3.1</maven-resources-version>
<maven-resources-version>3.5.0</maven-resources-version>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
<maven-compiler-version>3.14.1</maven-compiler-version>
<maven-compiler-version>3.15.0</maven-compiler-version>

<!-- reference to workspace root -->
<workspaceDir>${basedir}/..</workspaceDir>
Expand Down Expand Up @@ -233,7 +233,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<version>3.43.0</version>
<version>3.45.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
2 changes: 0 additions & 2 deletions trunk/source/BA_SiteRepository/CLI-E4.product
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@

<features>
<feature id="BA_FeatureUltimateCommandLine"/>
<feature id="BA_FeatureUltimateCommon"/>
<feature id="BA_FeatureDependenciesCommon"/>
</features>

<configurations>
Expand Down
3 changes: 0 additions & 3 deletions trunk/source/BA_SiteRepository/Debug-E4.product
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
</plugins>

<features>
<feature id="BA_FeatureDependenciesCommon"/>
<feature id="BA_FeatureDependenciesDebugE4"/>
<feature id="BA_FeatureUltimateCommon"/>
<feature id="BA_FeatureUltimateDebug"/>
</features>

Expand Down
2 changes: 0 additions & 2 deletions trunk/source/BA_SiteRepository/DeltaDebugger.product
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@

<features>
<feature id="BA_FeatureUltimateDeltaDebugger"/>
<feature id="BA_FeatureUltimateCommon"/>
<feature id="BA_FeatureDependenciesCommon"/>
</features>

<configurations>
Expand Down
Loading