Changeset 37879 for other-projects


Ignore:
Timestamp:
2023-08-03T19:08:12+12:00 (10 months ago)
Author:
anupama
Message:

The Zulu 8 JDK for linux64 bit doesn't have javafx (and may be missing more), but added the code to now bundle a jdk with Expeditee, not just a JRE. The code added is for linux, need to put it into an if-else clause based on OS and add similar logic for windows, once the correct JDK to work with Expeditee has been determined.

Location:
other-projects/expeditee-release-kits/trunk
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • other-projects/expeditee-release-kits/trunk/kits/rke/ant-scripts/compile.xml

    r37878 r37879  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<project name="rke-compile">
    3 
    43  <!-- to stop svn failing due to untrusted certificate on linux -->
    54  <property name="global-svn-args" value="--non-interactive --trust-server-cert"/>
    … …  
    1110            <!--<arg value="MINUSMINUSforce-interactive"/>-->
    1211            <arg value="http://svn.expeditee.org/trunk"/>
    13             <arg value="${basedir}/expeditee"/>         
     12            <arg value="${basedir}/expeditee"/>
    1413        </exec>
    15 
     14       
    1615        <ant dir="${basedir}/expeditee" antfile="${basedir}/expeditee/build.xml" target="inst" />
    1716        <move todir="compiled">
    … …  
    4443            </copy>
    4544        </if>
     45
     46        <!-- copy packages/jdk -->
     47        <mkdir dir="${basedir}/compiled/packages"/>
     48        <copy todir="${basedir}/compiled/packages">
     49                  <fileset dir="${rk.home}/dist-packages">
     50                    <include name="**" />
     51                  </fileset>
     52                </copy>
     53
    4654    </target>
    4755</project>

  • other-projects/expeditee-release-kits/trunk/kits/rke/installer/antinstall-config.xml

    r28742 r37879  
    7171
    7272        <target
    73             target="Installing Java Runtime"
     73            target="Installing Java"
    7474            diskRequirement="@component.size.java@"
    7575            displayText=""

  • other-projects/expeditee-release-kits/trunk/kits/rke/installer/build.xml

    r37794 r37879  
    99    <property file="${basedir}/ant.install.properties"/>
    1010
     11    <!-- Set the JDK tarball name (same as its extracted folder name) that's to be bundled.
     12         This name includes vendor and version information, but the name will be replaced
     13         by generic extracted folder name "jdk".
     14    -->
     15    <property name="jdk.name" value="zulu8.72.0.17-ca-jdk8.0.382-linux_x64"/>
     16   
    1117    <!-- set some properties to keep track of the OS -->
    1218    <!-- if windows -->
    … …  
    99105
    100106    <!-- <target name="Initialising" if="bundled.java.exists"> -->
    101     <!-- Java Runtime  -->
    102     <target name="Installing Java Runtime">
    103         <echo>Installing the Java Runtime</echo>
     107    <!-- Java Runtime now changed to JDK -->
     108    <target name="Installing Java">
     109      <echo>Installing the Java Development Kit</echo>
     110      <!--
     111      <echo>Installing the Java Runtime</echo>   
    104112        <mkdir dir="${installDir}/packages"/>
    105113        <copy todir="${installDir}/packages/jre" failonerror="false">
    … …  
    107115        </copy>
    108116        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
     117      -->     
     118      <untar src="${installDir}/packages/${jdk.name}.tar.gz" dest="${installDir}/packages/" compression="gzip"/>
     119      <delete file="${installDir}/packages/${jdk.name}.tar.gz"/>
     120      <move file="${installDir}/packages/${jdk.name}" tofile="${installDir}/packages/jdk"/>
     121      <!-- Give user execute permissions for all the bins in the jdk and its jre -->
     122      <chmod dir="${installDir}/packages/jdk/bin" includes="*" perm="775"/>
     123      <chmod dir="${installDir}/packages/jdk/jre/bin" includes="*" perm="775"/>
    109124    </target>
    110125

  • other-projects/expeditee-release-kits/trunk/scripts/bin/findjava.bat

    r28740 r37879  
    1919set SEARCH4J_EXECUTABLE=search4j.exe
    2020::set HINT=%EXPEDITEE_HOME%\packages\jre
    21 set HINT=packages\jre
     21::set HINT=packages\jre
     22set HINT=packages\jdk
    2223if exist %SEARCH4J_EXECUTABLE% goto setJexec
    2324set SEARCH4J_EXECUTABLE=%EXPEDITEE_HOME%\bin\search4j.exe

  • other-projects/expeditee-release-kits/trunk/scripts/bin/findjava.sh

    r28721 r37879  
    5353    # Give search4j a hint to find Java depending on the platform
    5454    if [ "$EXPEDITEE_OS" = "linux" ]; then
    55     HINT=`cd "$EXPEDITEE_HOME";pwd`/packages/jre
     55    ##HINT=`cd "$EXPEDITEE_HOME";pwd`/packages/jre
     56    HINT=`cd "$EXPEDITEE_HOME";pwd`/packages/jdk
    5657    elif [ "$EXPEDITEE_OS" = "darwin" ]; then
    5758    HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
Note: See TracChangeset for help on using the changeset viewer.