Magellan Linux

  • Back to homepage
    • /[smage]/trunk/extras/apache-ant/apache-ant-1.9.7-r1.smage2

    Diff of /trunk/extras/apache-ant/apache-ant-1.9.7-r1.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 28031 by niro, Tue May 3 14:25:49 2016 UTC revision 28032 by niro, Mon May 9 08:26:25 2016 UTC
    # Line 16  DEPEND=">= virtual/java-jdk Line 16  DEPEND=">= virtual/java-jdk
    16   >= dev-java/junit-4.12   >= dev-java/junit-4.12
    17   >= dev-java/hamcrest-1.3"   >= dev-java/hamcrest-1.3"
    18    
     SDEPEND=">= virtual/sed"  
       
    19  if [[ ${BOOTSTRAP} = 0 ]]  if [[ ${BOOTSTRAP} = 0 ]]
    20  then  then
    21   SDEPEND="${SDEPEND}   SDEPEND=">= dev-java/apache-ant-1.9"
      >= dev-java/apache-ant-1.9"  
    22  fi  fi
    23    
    24  SRCFILE="${PNAME}-${PVER}-src.tar.bz2"  SRCFILE="${PNAME}-${PVER}-src.tar.bz2"
    # Line 44  src_prepare() Line 41  src_prepare()
    41  {  {
    42   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
    43   munpack ${OPT_SRCFILE} ${SRCDIR}/lib/optional || die   munpack ${OPT_SRCFILE} ${SRCDIR}/lib/optional || die
      cd ${SRCDIR}  
       
      # fix memory issues with systemd-nspawn  
     # sed -i 's:maxmemory="1000M":maxmemory="100M":' build.xml || die  
    44  }  }
    45    
    46  src_compile()  src_compile()
    # Line 69  src_compile() Line 62  src_compile()
    62   # and linking it to lib/optional as apache-ant has now a hard-dependency to it   # and linking it to lib/optional as apache-ant has now a hard-dependency to it
    63   echo "Using junit.jar from ${junit}!"   echo "Using junit.jar from ${junit}!"
    64   #rm -v ${SRCDIR}/lib/optional/junit.jar || die   #rm -v ${SRCDIR}/lib/optional/junit.jar || die
    65   #ln -snf ${unit} ${SRCDIR}/lib/optional/junit.jar || die   #ln -snf ${junit} ${SRCDIR}/lib/optional/junit.jar || die
    66   rm -v ${SRCDIR}/lib/optional/junit-4.11.jar || die   rm -v ${SRCDIR}/lib/optional/junit-4.11.jar || die
    67   ln -vsnf ${unit} ${SRCDIR}/lib/optional/junit-4.11.jar || die   ln -vsnf ${junit} ${SRCDIR}/lib/optional/junit-4.11.jar || die
    68    
    69   # get hamcrest-core from classpath   # get hamcrest-core from classpath
    70   if [[ -L ${JAVA_CLASSPATH_DIR}/hamcrest-core.jar ]]   if [[ -L ${JAVA_CLASSPATH_DIR}/hamcrest-core.jar ]]
    # Line 91  src_compile() Line 84  src_compile()
    84   *) die "unknown bootstrap option '${BOOTSTRAP}'" ;;   *) die "unknown bootstrap option '${BOOTSTRAP}'" ;;
    85   esac   esac
    86    
    87  # we use a tarball which provides all optionals to honor proxy  # we use a tarball which provides all optionals to honor proxies
    88  #  #
    89  # # ant needs HOME to download libs to $HOME/.m2/repository  # # ant needs HOME to download libs to $HOME/.m2/repository
    90  # # this one does not honor authenticated proxies  # # this one does not honor authenticated proxies
    Legend:
    Removed from v.28031  
    changed lines
      Added in v.28032