Skip to content
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

remove slice2java #6325

Merged
merged 7 commits into from
Jun 27, 2022
Merged

remove slice2java #6325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2980bfe
remove ice from version parsing
jburel Jun 21, 2022
ca64c2d
remove slice2java
jburel Jun 21, 2022
f45d67a
remove slice2java
jburel Jun 21, 2022
59562c9
do not drop ice36 from name for now
jburel Jun 22, 2022
4994dbc
remove slice2py
jburel Jun 22, 2022
b96a8b1
remove installation of ice action
jburel Jun 22, 2022
134d86a
insert ice version
jburel Jun 23, 2022
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 .github/workflows/source_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: ome/action-ice@v1
- name: Install and run flake8
run: |
pip install flake8
Expand Down
28 changes: 1 addition & 27 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level
<property name="import.dir" value="${basedir}/components/antlib/resources"/>
<import file="${import.dir}/global.xml"/>

<target name="init" depends="check-ivy,check-scons,check-ice">
<target name="init" depends="check-ivy,check-scons">
</target>

<target name="check-git">
Expand Down Expand Up @@ -95,32 +95,6 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level
<unzip src="${lib.dir}/repository/scons-local-2.1.0.zip" dest="target/scons"/>
</target>

<target name="check-ice" description="Checks Ice versioning">
<!-- Checking the slice2* version before continuing. See #1185 -->
<exec outputproperty="executable.ice.version" executable="${ice.slice2java}">
<arg value="--version"/>
</exec>
<if>
<not>
<or>
<matches pattern="^${ice.compatibility}" string="${executable.ice.version}"/>
<matches pattern="^${ice.compatibility}" string="auto"/>
</or>
</not>
<then><fail>WRONG ICE VERSION!

slice2java (${ice.slice2java}) version = ${executable.ice.version}
Expected version = ${ice.compatibility}

If you would like to configure which Ice to use, set
ice.compatibility=ice_version in etc/local.properties
or on the command-line, e.g.:

./build.py -Dice.compatibility=3.6

</fail></then>
</if>
</target>

<target name="build-default" description="Default build calls build" depends="build"/>
<target name="build" description="Build all components" depends="init">
Expand Down
77 changes: 5 additions & 72 deletions components/antlib/resources/global.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,6 @@
<condition property="ice.home" value="${env.ICE_HOME}">
<isset property="env.ICE_HOME"/>
</condition>
<condition property="ice.slice2java" value="${env.SLICE2JAVA}">
<isset property="env.SLICE2JAVA"/>
</condition>
<condition property="ice.slice2py" value="${env.SLICE2PY}">
<isset property="env.SLICE2PY"/>
</condition>
<condition property="ice.slice2cpp" value="${env.SLICE2CPP}">
<isset property="env.SLICE2CPP"/>
</condition>
Expand Down Expand Up @@ -263,16 +257,6 @@
</condition>
<property name="ice.home" value=""/>

<condition property="ice.slice2java" value="${ice.home}/bin/slice2java">
<available file="${ice.home}/bin/slice2java"/>
</condition>
<property name="ice.slice2java" value="slice2java"/>

<condition property="ice.slice2py" value="${ice.home}/bin/slice2py">
<available file="${ice.home}/bin/slice2py"/>
</condition>
<property name="ice.slice2py" value="slice2py"/>

<condition property="ice.slice2cpp" value="${ice.home}/bin/slice2cpp">
<available file="${ice.home}/bin/slice2cpp"/>
</condition>
Expand All @@ -284,58 +268,11 @@
<property name="ice.slice2html" value="slice2html"/>

<!-- Checking the slice2* version before continuing. See #1185 -->
<exec outputproperty="executable.ice.version" executable="${ice.slice2java}"
failifexecutionfails="false" failonerror="false" resultproperty="slice2java.result">
<arg value="--version"/>
</exec>

<!-- Checking ice compatibility and choose the proper version -->
<if><not><equals arg1="${slice2java.result}" arg2="0"/></not>
<then>
<fail> Cannot find slice2java!

*******************************************************
Ice is not properly installed. Cannot find slice2java
*******************************************************
</fail>
</then>
</if>

<propertyregex property="executable.ice.shortversion" input="${executable.ice.version}" select="\1.\2">
<regexp pattern="([0-9]*)\.([0-9]*)\.([0-9]*).*"/>
</propertyregex>

<if><equals arg1="auto" arg2="${ice.compatibility}"/>
<then>
<if><matches string="${executable.ice.version}" pattern="^3[.]6"/>
<then>
<property name="versions.ice" value="${versions.ice36}"/>
<property name="versions.ice_lib" value="${versions.ice36_lib}"/>
<property name="versions.icedb" value="${versions.icedb36}"/>
<property name="versions.omeromock" value="${versions.omeromock36}"/>
<property name="versions.omeroshares" value="${versions.omeroshares36}"/>
</then>
</if>
</then>
<elseif>
<equals arg1="3.6" arg2="${ice.compatibility}"/>
<then>
<property name="versions.ice" value="${versions.ice36}"/>
<property name="versions.ice_lib" value="${versions.ice36_lib}"/>
<property name="versions.icedb" value="${versions.icedb36}"/>
<property name="versions.omeromock" value="${versions.omeromock36}"/>
<property name="versions.omeroshares" value="${versions.omeroshares36}"/>
</then>
</elseif>
<else>
<fail> Bad configuration!

*******************************************************
Unknown Ice compatibility setting: ${ice.compatibility}
*******************************************************
</fail>
</else>
</if>
<property name="versions.ice" value="${versions.ice36}"/>
<property name="versions.ice_lib" value="${versions.ice36_lib}"/>
<property name="versions.icedb" value="${versions.icedb36}"/>
<property name="versions.omeromock" value="${versions.omeromock36}"/>
<property name="versions.omeroshares" value="${versions.omeroshares36}"/>

<condition property="ice.slicepath" value="${ice.home}/slice">
<available file="${ice.home}/slice" type="dir"/>
Expand Down Expand Up @@ -511,16 +448,12 @@
<property name="env.ARCH" value="detect"/>
<property name="env.RELEASE" value="debug"/>
<echo>Building with ICE_HOME=${ice.home}</echo>
<echo>Building with SLICE2JAVA=${ice.slice2java}</echo>
<echo>Building with SLICE2PY=${ice.slice2py}</echo>
<echo>Building with SLICE2CPP=${ice.slice2cpp}</echo>
<echo>Building with SLICE2HTML=${ice.slice2html}</echo>
<echo>Building with SLICEPATH=${ice.slicepath}</echo>
<exec executable="python" dir="@{dir}" failonerror="@{failonerror}">
<env key="PYTHONPATH" value="@{pythonpath}"/>
<env key="ICE_HOME" value="${ice.home}"/>
<env key="SLICE2JAVA" value="${ice.slice2java}"/>
<env key="SLICE2PY" value="${ice.slice2py}"/>
<env key="SLICE2CPP" value="${ice.slice2cpp}"/>
<env key="SLICE2HTML" value="${ice.slice2html}"/>
<env key="SLICEPATH" value="${ice.slicepath}"/>
Expand Down