Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/files/
Date: Tue, 11 Jan 2022 17:57:42
Message-Id: 1641923831.ee0c25878e702fe30c97b33b69a27254f654ee8a.andrewammerlaan@gentoo
1 commit: ee0c25878e702fe30c97b33b69a27254f654ee8a
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 11 17:57:11 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 11 17:57:11 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0c2587
7
8 sci-misc/netlogo-bin: cleanup left over files
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
12
13 sci-misc/netlogo-bin/files/behaviorsearch-6.0.2.sh | 38 --------------------
14 sci-misc/netlogo-bin/files/hubnetclient-6.0.2.sh | 40 ----------------------
15 sci-misc/netlogo-bin/files/netlogo-6.0.2.sh | 40 ----------------------
16 sci-misc/netlogo-bin/files/netlogo3d-6.0.2.sh | 40 ----------------------
17 4 files changed, 158 deletions(-)
18
19 diff --git a/sci-misc/netlogo-bin/files/behaviorsearch-6.0.2.sh b/sci-misc/netlogo-bin/files/behaviorsearch-6.0.2.sh
20 deleted file mode 100644
21 index 225f4a332cff..000000000000
22 --- a/sci-misc/netlogo-bin/files/behaviorsearch-6.0.2.sh
23 +++ /dev/null
24 @@ -1,38 +0,0 @@
25 -#!/bin/bash
26 -
27 -WD="`pwd`" #store the current working directory, where this script was called from.
28 -
29 -#BehaviorSearch needs to start in the NetLogo base folder,
30 -# and "behaviorsearch" must be installed in a subfolder of the NetLogo folder.
31 -NETLOGO_DIR="$( dirname $( readlink -f "$0" ))" # the copious quoting is for handling paths with spaces
32 -cd "$NETLOGO_DIR"
33 -NETLOGO_DIR="`pwd`" #in case it's a relative path, like "."
34 -LIBRARY_DIR="${NETLOGO_DIR}/app"
35 -BSEARCH_DIR="${LIBRARY_DIR}/behaviorsearch"
36 -
37 -JARS=""
38 -for f in `ls -1 "$LIBRARY_DIR" | grep "jar"`; do
39 - JARS="$LIBRARY_DIR/$f:$JARS"
40 -done
41 -
42 -# If you want to use a different version of java, or if "java" is not in your PATH,
43 -# you can run this script with the BSEARCH_JAVA environment variable pointing
44 -# to the java executable you want to use. e.g. "/opt/java6/bin/java"
45 -if [ -z "$BSEARCH_JAVA" ]; then
46 - BSEARCH_JAVA="java"
47 -fi
48 -
49 -JAVA_VERSION=`"$BSEARCH_JAVA" -version 2>&1 | head -n1 | awk '{ print substr($3,2,3) }' | sed -e 's;\.;0;g'`
50 -if [ $JAVA_VERSION -lt 108 ]; then #108 = java 1.8
51 - echo "Sorry, this program requires Java Runtime Environment 1.8 or higher"
52 - exit 1
53 -fi
54 -
55 -# If you have enough RAM, up the '1536m' below to '2048m' or more.
56 -# Or you can set the BSEARCH_MAXMEM environment variable when running the script
57 -# More RAM is especially helpful for multiple threads/parallel execution.
58 -if [ -z "$BSEARCH_MAXMEM" ]; then
59 - BSEARCH_MAXMEM=1536m
60 -fi
61 -
62 -"$BSEARCH_JAVA" -Dbsearch.startupfolder="$WD" -Dbsearch.appfolder="$BSEARCH_DIR" -server -Xms256m "-Xmx$BSEARCH_MAXMEM" -classpath "$JARS" bsearch.app.BehaviorSearch "$@"
63
64 diff --git a/sci-misc/netlogo-bin/files/hubnetclient-6.0.2.sh b/sci-misc/netlogo-bin/files/hubnetclient-6.0.2.sh
65 deleted file mode 100644
66 index 3fb98d0909f1..000000000000
67 --- a/sci-misc/netlogo-bin/files/hubnetclient-6.0.2.sh
68 +++ /dev/null
69 @@ -1,40 +0,0 @@
70 -#!/bin/bash
71 -
72 -BASE_DIR="$( cd "$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )" && pwd -P )"
73 -
74 -if [[ ${JAVA_HOME+1} ]]; then
75 - JAVA="${JAVA_HOME}/bin/java"
76 -else
77 - echo "JAVA_HOME undefined, using java from path. For control over exact java version, set JAVA_HOME"
78 - JAVA="java"
79 -fi;
80 -
81 -# -Xmx1024m use up to 1GB RAM (edit to increase)
82 -# -Dfile.encoding=UTF-8 ensure Unicode characters in model files are compatible cross-platform
83 -JVM_OPTS=(-Xmx1024m -Dfile.encoding=UTF-8)
84 -OPTS_INDEX=2
85 -
86 -ARGS=()
87 -INDEX=0
88 -
89 -for arg in "$@"; do
90 - if [[ "$arg" == -D* ]]; then
91 - JVM_OPTS[OPTS_INDEX++]="$arg"
92 - else
93 - ARGS[INDEX++]="$arg"
94 - fi
95 -done
96 -
97 -RAW_CLASSPATH="args4j-2.0.12.jar:asm-all-5.0.4.jar:asm-all-5.0.4.jar:autolink-0.6.0.jar:behaviorsearch.jar:commons-codec-1.10.jar:commons-logging-1.1.1.jar:config-1.3.1.jar:flexmark-0.20.0.jar:flexmark-ext-autolink-0.20.0.jar:flexmark-ext-escaped-character-0.20.0.jar:flexmark-ext-typographic-0.20.0.jar:flexmark-formatter-0.20.0.jar:flexmark-util-0.20.0.jar:gluegen-rt-2.3.2.jar:httpclient-4.2.jar:httpcore-4.2.jar:httpmime-4.2.jar:jcommon-1.0.16.jar:jfreechart-1.0.13.jar:jhotdraw-6.0b1.jar:jmf-2.1.1e.jar:jogl-all-2.3.2.jar:json-simple-1.1.1.jar:log4j-1.2.16.jar:macro-compat_2.12-1.1.1.jar:macro-compat_2.12-1.1.1.jar:netlogo-6.0.2.jar:parboiled_2.12-2.1.3.jar:parboiled_2.12-2.1.3.jar:picocontainer-2.13.6.jar:picocontainer-2.13.6.jar:rsyntaxtextarea-2.6.0.jar:scala-library-2.12.2.jar:scala-parser-combinators_2.12-1.0.5.jar:shapeless_2.12-2.3.2.jar:shapeless_2.12-2.3.2.jar"
98 -CLASSPATH=''
99 -
100 -for jar in `echo $RAW_CLASSPATH | sed 's/:/ /g'`; do
101 - CLASSPATH="$CLASSPATH:$BASE_DIR/app/$jar"
102 -done
103 -
104 -CLASSPATH=`echo $CLASSPATH | sed 's/://'`
105 -
106 -# -classpath .... specify jars
107 -# org.nlogo.headless.Main specify we want headless, not GUI
108 -# "${ARGS[0]}" pass along any additional arguments
109 -java "${JVM_OPTS[@]}" -Dnetlogo.extensions.dir="${BASE_DIR}/app/extensions" -classpath "$CLASSPATH" -Dorg.nlogo.is3d=true org.nlogo.hubnet.client.App "${ARGS[@]}"
110
111 diff --git a/sci-misc/netlogo-bin/files/netlogo-6.0.2.sh b/sci-misc/netlogo-bin/files/netlogo-6.0.2.sh
112 deleted file mode 100644
113 index 5ad35832ba28..000000000000
114 --- a/sci-misc/netlogo-bin/files/netlogo-6.0.2.sh
115 +++ /dev/null
116 @@ -1,40 +0,0 @@
117 -#!/bin/bash
118 -
119 -BASE_DIR="$( cd "$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )" && pwd -P )"
120 -
121 -if [[ ${JAVA_HOME+1} ]]; then
122 - JAVA="${JAVA_HOME}/bin/java"
123 -else
124 - echo "JAVA_HOME undefined, using java from path. For control over exact java version, set JAVA_HOME"
125 - JAVA="java"
126 -fi;
127 -
128 -# -Xmx1024m use up to 1GB RAM (edit to increase)
129 -# -Dfile.encoding=UTF-8 ensure Unicode characters in model files are compatible cross-platform
130 -JVM_OPTS=(-Xmx1024m -Dfile.encoding=UTF-8)
131 -OPTS_INDEX=2
132 -
133 -ARGS=()
134 -INDEX=0
135 -
136 -for arg in "$@"; do
137 - if [[ "$arg" == -D* ]]; then
138 - JVM_OPTS[OPTS_INDEX++]="$arg"
139 - else
140 - ARGS[INDEX++]="$arg"
141 - fi
142 -done
143 -
144 -RAW_CLASSPATH="args4j-2.0.12.jar:asm-all-5.0.4.jar:asm-all-5.0.4.jar:autolink-0.6.0.jar:behaviorsearch.jar:commons-codec-1.10.jar:commons-logging-1.1.1.jar:config-1.3.1.jar:flexmark-0.20.0.jar:flexmark-ext-autolink-0.20.0.jar:flexmark-ext-escaped-character-0.20.0.jar:flexmark-ext-typographic-0.20.0.jar:flexmark-formatter-0.20.0.jar:flexmark-util-0.20.0.jar:gluegen-rt-2.3.2.jar:httpclient-4.2.jar:httpcore-4.2.jar:httpmime-4.2.jar:jcommon-1.0.16.jar:jfreechart-1.0.13.jar:jhotdraw-6.0b1.jar:jmf-2.1.1e.jar:jogl-all-2.3.2.jar:json-simple-1.1.1.jar:log4j-1.2.16.jar:macro-compat_2.12-1.1.1.jar:macro-compat_2.12-1.1.1.jar:netlogo-6.0.2.jar:parboiled_2.12-2.1.3.jar:parboiled_2.12-2.1.3.jar:picocontainer-2.13.6.jar:picocontainer-2.13.6.jar:rsyntaxtextarea-2.6.0.jar:scala-library-2.12.2.jar:scala-parser-combinators_2.12-1.0.5.jar:shapeless_2.12-2.3.2.jar:shapeless_2.12-2.3.2.jar"
145 -CLASSPATH=''
146 -
147 -for jar in `echo $RAW_CLASSPATH | sed 's/:/ /g'`; do
148 - CLASSPATH="$CLASSPATH:$BASE_DIR/app/$jar"
149 -done
150 -
151 -CLASSPATH=`echo $CLASSPATH | sed 's/://'`
152 -
153 -# -classpath .... specify jars
154 -# org.nlogo.headless.Main specify we want headless, not GUI
155 -# "${ARGS[0]}" pass along any additional arguments
156 -java "${JVM_OPTS[@]}" -Dnetlogo.extensions.dir="${BASE_DIR}/app/extensions" -classpath "$CLASSPATH" org.nlogo.app.App "${ARGS[@]}"
157
158 diff --git a/sci-misc/netlogo-bin/files/netlogo3d-6.0.2.sh b/sci-misc/netlogo-bin/files/netlogo3d-6.0.2.sh
159 deleted file mode 100644
160 index 5db1d3a2847b..000000000000
161 --- a/sci-misc/netlogo-bin/files/netlogo3d-6.0.2.sh
162 +++ /dev/null
163 @@ -1,40 +0,0 @@
164 -#!/bin/bash
165 -
166 -BASE_DIR="$( cd "$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )" && pwd -P )"
167 -
168 -if [[ ${JAVA_HOME+1} ]]; then
169 - JAVA="${JAVA_HOME}/bin/java"
170 -else
171 - echo "JAVA_HOME undefined, using java from path. For control over exact java version, set JAVA_HOME"
172 - JAVA="java"
173 -fi;
174 -
175 -# -Xmx1024m use up to 1GB RAM (edit to increase)
176 -# -Dfile.encoding=UTF-8 ensure Unicode characters in model files are compatible cross-platform
177 -JVM_OPTS=(-Xmx1024m -Dfile.encoding=UTF-8)
178 -OPTS_INDEX=2
179 -
180 -ARGS=()
181 -INDEX=0
182 -
183 -for arg in "$@"; do
184 - if [[ "$arg" == -D* ]]; then
185 - JVM_OPTS[OPTS_INDEX++]="$arg"
186 - else
187 - ARGS[INDEX++]="$arg"
188 - fi
189 -done
190 -
191 -RAW_CLASSPATH="args4j-2.0.12.jar:asm-all-5.0.4.jar:asm-all-5.0.4.jar:autolink-0.6.0.jar:behaviorsearch.jar:commons-codec-1.10.jar:commons-logging-1.1.1.jar:config-1.3.1.jar:flexmark-0.20.0.jar:flexmark-ext-autolink-0.20.0.jar:flexmark-ext-escaped-character-0.20.0.jar:flexmark-ext-typographic-0.20.0.jar:flexmark-formatter-0.20.0.jar:flexmark-util-0.20.0.jar:gluegen-rt-2.3.2.jar:httpclient-4.2.jar:httpcore-4.2.jar:httpmime-4.2.jar:jcommon-1.0.16.jar:jfreechart-1.0.13.jar:jhotdraw-6.0b1.jar:jmf-2.1.1e.jar:jogl-all-2.3.2.jar:json-simple-1.1.1.jar:log4j-1.2.16.jar:macro-compat_2.12-1.1.1.jar:macro-compat_2.12-1.1.1.jar:netlogo-6.0.2.jar:parboiled_2.12-2.1.3.jar:parboiled_2.12-2.1.3.jar:picocontainer-2.13.6.jar:picocontainer-2.13.6.jar:rsyntaxtextarea-2.6.0.jar:scala-library-2.12.2.jar:scala-parser-combinators_2.12-1.0.5.jar:shapeless_2.12-2.3.2.jar:shapeless_2.12-2.3.2.jar"
192 -CLASSPATH=''
193 -
194 -for jar in `echo $RAW_CLASSPATH | sed 's/:/ /g'`; do
195 - CLASSPATH="$CLASSPATH:$BASE_DIR/app/$jar"
196 -done
197 -
198 -CLASSPATH=`echo $CLASSPATH | sed 's/://'`
199 -
200 -# -classpath .... specify jars
201 -# org.nlogo.headless.Main specify we want headless, not GUI
202 -# "${ARGS[0]}" pass along any additional arguments
203 -java "${JVM_OPTS[@]}" -Dnetlogo.extensions.dir="${BASE_DIR}/app/extensions" -classpath "$CLASSPATH" -Dorg.nlogo.is3d=true -Djava.library.path="${BASE_DIR}/app/natives/linux-amd64/:${env_var:PATH}" org.nlogo.app.App "${ARGS[@]}"