components/library/jaxb/patches/01-paths.patch

   1 --- jaxb-ri-2.2.11/bundles/ri/src/main/resources/bin/xjc.sh.1   2017-02-11 11:21:01.295994888 +0300
   2 +++ jaxb-ri-2.2.11/bundles/ri/src/main/resources/bin/xjc.sh     2017-02-11 11:23:09.715644043 +0300
   3 @@ -44,38 +44,9 @@
   4  #
   5  if [ -z "$JAXB_HOME" ]
   6  then
   7 -    # search the installation directory
   8 -
   9 -    PRG=$0
  10 -    progname=`basename $0`
  11 -    saveddir=`pwd`
  12 -
  13 -    cd "`dirname $PRG`"
  14 -
  15 -    while [ -h "$PRG" ] ; do
  16 -        ls=`ls -ld "$PRG"`
  17 -        link=`expr "$ls" : '.*-> \(.*\)$'`
  18 -        if expr "$link" : '.*/.*' > /dev/null; then
  19 -            PRG="$link"
  20 -        else
  21 -            PRG="`dirname $PRG`/$link"
  22 -        fi
  23 -    done
  24 -
  25 -    JAXB_HOME=`dirname "$PRG"`/..
  26 -
  27 -    # make it fully qualified
  28 -    cd "$saveddir"
  29 -    JAXB_HOME=`cd "$JAXB_HOME" && pwd`
  30 -
  31 -    cd "$saveddir"
  32 +    JAXB_HOME=/usr/share/lib/java
  33  fi
  34
  35 -[ `expr \`uname\` : 'CYGWIN'` -eq 6 ] &&
  36 -{
  37 -    JAXB_HOME=`cygpath -w "$JAXB_HOME"`
  38 -}
  39 -
  40  if [ -n "$JAVA_HOME" ]
  41  then
  42      JAVA="$JAVA_HOME/bin/java"
  43 @@ -83,4 +54,4 @@
  44      JAVA=java
  45  fi
  46
  47 -exec "$JAVA" $XJC_OPTS -jar "$JAXB_HOME/lib/jaxb-xjc.jar" "$@"
  48 +exec "$JAVA" $XJC_OPTS -jar "$JAXB_HOME/jaxb-xjc.jar" "$@"
  49 --- jaxb-ri-2.2.11/bundles/ri/src/main/resources/bin/schemagen.sh.1     2017-02-11 11:21:15.798391334 +0300
  50 +++ jaxb-ri-2.2.11/bundles/ri/src/main/resources/bin/schemagen.sh       2017-02-11 11:29:30.749818099 +0300
  51 @@ -44,31 +44,7 @@
  52  #
  53  if [ -z "$JAXB_HOME" ]
  54  then
  55 -    # search the installation directory
  56 -
  57 -    PRG=$0
  58 -    progname=`basename $0`
  59 -    saveddir=`pwd`
  60 -
  61 -    cd `dirname $PRG`
  62 -
  63 -    while [ -h "$PRG" ] ; do
  64 -        ls=`ls -ld "$PRG"`
  65 -        link=`expr "$ls" : '.*-> \(.*\)$'`
  66 -        if expr "$link" : '.*/.*' > /dev/null; then
  67 -            PRG="$link"
  68 -        else
  69 -            PRG="`dirname $PRG`/$link"
  70 -        fi
  71 -    done
  72 -
  73 -    JAXB_HOME=`dirname "$PRG"`/..
  74 -
  75 -    # make it fully qualified
  76 -    cd "$saveddir"
  77 -    JAXB_HOME=`cd "$JAXB_HOME" && pwd`
  78 -
  79 -    cd $saveddir
  80 +    JAXB_HOME=/usr/share/lib/java
  81  fi
  82
  83  if [ -n "$CLASSPATH" ] ; then
  84 @@ -77,31 +53,18 @@
  85
  86  # add the api jar file
  87  if [ -z "$LOCALCLASSPATH" ] ; then
  88 -    LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-core.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar:"$JAXB_HOME"/lib/jaxb-jxc.jar:"$JAXB_HOME"/lib/jaxb-impl.jar
  89 +    LOCALCLASSPATH="$JAXB_HOME"/jaxb-api.jar:"$JAXB_HOME"/jaxb-core.jar:"$JAXB_HOME"/jaxb-xjc.jar:"$JAXB_HOME"/jaxb-jxc.jar:"$JAXB_HOME"/jaxb-impl.jar
  90  else
  91 -    LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-core.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar:"$JAXB_HOME"/lib/jaxb-jxc.jar:"$JAXB_HOME"/lib/jaxb-impl.jar:"$LOCALCLASSPATH"
  92 +    LOCALCLASSPATH="$JAXB_HOME"/jaxb-api.jar:"$JAXB_HOME"/jaxb-core.jar:"$JAXB_HOME"/jaxb-xjc.jar:"$JAXB_HOME"/jaxb-jxc.jar:"$JAXB_HOME"/jaxb-impl.jar:"$LOCALCLASSPATH"
  93  fi
  94
  95 +if [ -z "$JAVA_HOME" ]; then
  96 +    JAVA_HOME="/usr/java"
  97 +fi
  98
  99 -if [ -n "$JAVA_HOME" ]
 100 -then
 101 +if [ -n "$JAVA_HOME" ]; then
 102      JAVA="$JAVA_HOME"/bin/java
 103      LOCALCLASSPATH="$JAVA_HOME"/lib/tools.jar:"$LOCALCLASSPATH"
 104 -else
 105 -    JAVA=java
 106 -    JAVACMD=`which $JAVA`
 107 -    BINDIR=`dirname $JAVACMD`
 108 -    LOCALCLASSPATH="$BINDIR"/../lib/tools.jar:"$LOCALCLASSPATH"
 109  fi
 110 -[ `expr \`uname\` : 'CYGWIN'` -eq 6 ] &&
 111 -{
 112 -    LOCALCLASSPATH=`cygpath -w -p ${LOCALCLASSPATH}`
 113 -}
 114 -
 115 -if [ `expr \`uname\` : 'CYGWIN'` -eq 6 ]
 116 -then
 117 -    JAXB_HOME="`cygpath -w "$JAXB_HOME"`"
 118 -fi
 119 -
 120
 121  exec "$JAVA" $SCHEMAGEN_OPTS -cp "$LOCALCLASSPATH" com.sun.tools.jxc.SchemaGeneratorFacade "$@"