Commit 6f70e903 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 18.08~pre+git20180810.9248fca+dfsg

parent 38b34374
Loading
Loading
Loading
Loading

.classpath

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="source/java"/>
	<classpathentry kind="src" path="sourceTest/java"/>
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
	<classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/>
	<classpathentry kind="lib" path="/libraries/restrictionchecker/restrictions.jar"/>
	<classpathentry kind="lib" path="/libraries/commons-io/commons-io.jar" sourcepath="/libraries/commons-io/src.zip"/>
	<classpathentry kind="lib" path="/libraries/commons-lang/commons-lang.jar" sourcepath="/libraries/commons-lang/src.zip"/>
	<classpathentry kind="lib" path="/libraries/unix"/>
	<classpathentry kind="lib" path="/libraries/nativedata"/>
	<classpathentry kind="output" path="targets/classes"/>
</classpath>

.gitignore

0 → 100644
+4 −0
Original line number Diff line number Diff line
/targets
/test-output
/bin
/build

branch.sh

deleted100755 → 0
+0 −35
Original line number Diff line number Diff line
#!/bin/bash

if [ `dirname $0` != "." ]
then
	echo "Please run from the same directory than the script source file is in"
	exit 1
fi

if [ $# -ne 1 ]
then
  echo "Usage: ./branch.sh [branch]"
  echo ""
  echo "Example: ./branch.sh release/13.04.x"
  exit 1
fi

svn info svn+ssh://svncisd.ethz.ch/repos/cisd/base/branches/$1 2>/dev/null
if [ $? -eq 0 ]; then echo "Branch already exists!"; exit 1; fi

CURRENT=`svn info|grep URL|cut -d" " -f2`

svn copy $CURRENT svn+ssh://svncisd.ethz.ch/repos/cisd/base/branches/$1 -m "create branch $1"
mkdir -p out
rm -r out/temp_checkout
svn checkout --depth=empty svn+ssh://svncisd.ethz.ch/repos/cisd/base/branches/$1 out/temp_checkout
if [ $? -ne 0 ]; then echo "Checkout of new branch $1 failed!"; exit 1; fi

cd out/temp_checkout
svn update gradlew gradle build.gradle
./gradlew dependencyReport
cat out/reports/project/dependencies.txt|egrep ^.---|grep \>|sort|uniq|awk '{print $2 ":" $4}'|awk -F: '{print "s/" $1 ":" $2 ":" $3 "/" $1 ":" $2 ":" $4 "/g"}' > sed_commands
sed -f sed_commands build.gradle > build.gradle.tmp
mv build.gradle.tmp build.gradle
svn commit build.gradle -m "fixed dependencies for branch $1"
cd ../..
+10 −2
Original line number Diff line number Diff line
apply from: '../gradle/javaproject.gradle'
apply from: './javaproject.gradle'

group='sis'

@@ -24,6 +24,14 @@ sourceSets {
}

jar {
    manifest {
        attributes 'Main-Class': 'ch.systemsx.cisd.base.BuildAndEnvironmentInfo'
    }

    from('targets/dist') {
        include 'BUILD*INFO'
    }    

    from fileTree("libs/")
}

build/antrun.sh

0 → 100755
+6 −0
Original line number Diff line number Diff line
#! /bin/bash

ME="$0"
MYDIR=${ME%/*}
cd $MYDIR
ant -lib ../../build_resources/lib/ecj.jar "$@"
Loading