diff --git a/.github/workflows/source_build.yml b/.github/workflows/source_build.yml index 4f97849a152..39c05018961 100644 --- a/.github/workflows/source_build.yml +++ b/.github/workflows/source_build.yml @@ -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 diff --git a/build.xml b/build.xml index 359e18a9dc6..d5f3c9503b3 100644 --- a/build.xml +++ b/build.xml @@ -34,7 +34,7 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level - + @@ -95,32 +95,6 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level - - - - - - - - - - - - - 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 - - - - diff --git a/components/antlib/resources/global.xml b/components/antlib/resources/global.xml index e5ac9e84f47..07b8f604932 100644 --- a/components/antlib/resources/global.xml +++ b/components/antlib/resources/global.xml @@ -221,12 +221,6 @@ - - - - - - @@ -263,16 +257,6 @@ - - - - - - - - - - @@ -284,58 +268,11 @@ - - - - - - - - Cannot find slice2java! - - ******************************************************* - Ice is not properly installed. Cannot find slice2java - ******************************************************* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bad configuration! - - ******************************************************* - Unknown Ice compatibility setting: ${ice.compatibility} - ******************************************************* - - - + + + + + @@ -511,16 +448,12 @@ Building with ICE_HOME=${ice.home} - Building with SLICE2JAVA=${ice.slice2java} - Building with SLICE2PY=${ice.slice2py} Building with SLICE2CPP=${ice.slice2cpp} Building with SLICE2HTML=${ice.slice2html} Building with SLICEPATH=${ice.slicepath} - -