<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[123891] trunk/dports/science/sumo/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/123891">123891</a></dd>
<dt>Author</dt> <dd>mf2k@macports.org</dd>
<dt>Date</dt> <dd>2014-08-15 13:11:18 -0700 (Fri, 15 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>sumo: Include additional libraries. (#44338)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencesumoPortfile">trunk/dports/science/sumo/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencesumoPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/sumo/Portfile (123890 => 123891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/sumo/Portfile 2014-08-15 20:10:51 UTC (rev 123890)
+++ trunk/dports/science/sumo/Portfile 2014-08-15 20:11:18 UTC (rev 123891)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> name sumo
</span><span class="cx"> conflicts sumo-devel
</span><span class="cx"> version 0.21.0
</span><ins>+revision 1
</ins><span class="cx"> categories science devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -52,22 +53,23 @@
</span><span class="cx"> reinplace -locale C "s#./PHEMlight/#${sharedir}/data/PHEMlight/#" src/tools/emissionsDrivingCycle_main.cpp
</span><span class="cx"> reinplace -locale C "s#./PHEMlight/#${sharedir}/data/PHEMlight/#" src/tools/emissionsMap_main.cpp
</span><span class="cx"> set python_bin ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
</span><del>- foreach f $python_scripts {
</del><ins>+ foreach f [list {*}$python_scripts {*}$python_libs {*}$python_tutorials] {
</ins><span class="cx"> reinplace "s#/usr/bin/env python#${python_bin}#" $f
</span><span class="cx"> reinplace -E "s|^(sys.path.append)|# \\1|" $f
</span><del>- reinplace -E "s#^from (dijkstra|inputs)#from assign.\\1#" $f
</del><ins>+ reinplace -E "s#^ *from (assign|costMemory|dijkstra|duaIterate|elements|inputs|network|outputs|routeChoices|statisticsElements|tables)#from sumolib.assign.\\1#" $f
+ reinplace -E "s#^ *from (miscutils|OrderedMultiSet|output|testUtil)#from sumolib.\\1#" $f
</ins><span class="cx"> reinplace -E "s#^import (xsd|collectinghandler|connections|turndefinitions|rmsd)#from sumolib import \\1#" $f
</span><span class="cx"> reinplace -E "s#^import (os,.*), helpers#import \\1, sumolib.helpers as helpers#" $f
</span><span class="cx"> }
</span><span class="cx"> foreach f $perl_scripts {
</span><span class="cx"> reinplace "s#/usr/bin/perl#${perl_bin}#" $f
</span><span class="cx"> }
</span><ins>+ reinplace -E "s#(removeTripsIfNotInInterval).pl#sumo-\\1#" tools/trip/splitTripsByHours.pl
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # List of all python scripts. Used later to ensure usage of python27
</span><span class="cx"> # (instead of the currently active python)
</span><del>-set python_scripts [ list \
- tools/bin/traceExporter.py \
</del><ins>+set python_scripts [list \
</ins><span class="cx"> tools/assign/Assignment.py \
</span><span class="cx"> tools/assign/cadytsIterate.py \
</span><span class="cx"> tools/assign/costFunctionChecker.py \
</span><span class="lines">@@ -76,10 +78,11 @@
</span><span class="cx"> tools/assign/matrixDailyToHourly.py \
</span><span class="cx"> tools/assign/networkStatistics.py \
</span><span class="cx"> tools/assign/one-shot.py \
</span><del>- tools/assign/run.py \
</del><ins>+ tools/bin/traceExporter.py \
</ins><span class="cx"> tools/detector/aggregateFlows.py \
</span><span class="cx"> tools/detector/deleteUnusedDetectors.py \
</span><span class="cx"> tools/detector/flowFromRoutes.py \
</span><ins>+ tools/detector/flowrouter.py \
</ins><span class="cx"> tools/net/0103to0110.py \
</span><span class="cx"> tools/net/0123to0130.py \
</span><span class="cx"> tools/net/batch0103to0110.py \
</span><span class="lines">@@ -90,11 +93,9 @@
</span><span class="cx"> tools/net/netextract.py \
</span><span class="cx"> tools/net/netextract_subPart.py \
</span><span class="cx"> tools/net/netmatch.py \
</span><del>- tools/net/netshiftadaptor.py \
</del><span class="cx"> tools/net/netstats.py \
</span><span class="cx"> tools/net/network_statistics.py \
</span><span class="cx"> tools/net/odConnectionsCheck.py \
</span><del>- tools/net/OrderedMultiSet.py \
</del><span class="cx"> tools/net/patchNetFiles.py \
</span><span class="cx"> tools/net/prepareVISUM.py \
</span><span class="cx"> tools/net/reprojectpolys.py \
</span><span class="lines">@@ -114,6 +115,7 @@
</span><span class="cx"> tools/output/netdumpmean.py \
</span><span class="cx"> tools/output/timingStats.py \
</span><span class="cx"> tools/output/vehLanes.py \
</span><ins>+ tools/output/vehroute2amitranOD.py \
</ins><span class="cx"> tools/output/vehrouteDiff.py \
</span><span class="cx"> tools/route/cutRoutes.py \
</span><span class="cx"> tools/route/extract_route_edges.py \
</span><span class="lines">@@ -136,6 +138,10 @@
</span><span class="cx"> tools/shapes/poi_alongRoads.py \
</span><span class="cx"> tools/shapes/poi_atTLS.py \
</span><span class="cx"> tools/shapes/pois2inductionLoops.py \
</span><ins>+ tools/tls/tls_check.py \
+ tools/tls/tls_csv2SUMO.py \
+ tools/traci/rebuildConstants.py \
+ tools/traci/traciToHex.py \
</ins><span class="cx"> tools/trigger/csv2vss.py \
</span><span class="cx"> tools/trip/randomTrips.py \
</span><span class="cx"> tools/trip/generateTripsXml.py \
</span><span class="lines">@@ -162,12 +168,44 @@
</span><span class="cx"> tools/xml/schemaCheck.py \
</span><span class="cx"> tools/xml/xml2csv.py \
</span><span class="cx"> tools/xml/xml2protobuf.py \
</span><del>- tools/xml/xsd.py ]
</del><ins>+]
</ins><span class="cx">
</span><del>-set perl_scripts [ list \
</del><ins>+set python_libs [list \
+ tools/assign/assign.py \
+ tools/assign/costMemory.py \
+ tools/assign/dijkstra.py \
+ tools/assign/elements.py \
+ tools/assign/inputs.py \
+ tools/assign/network.py \
+ tools/assign/outputs.py \
+ tools/assign/run.py \
+ tools/assign/statisticsElements.py \
+ tools/assign/tables.py \
+ tools/net/netshiftadaptor.py \
+ tools/net/OrderedMultiSet.py \
+ tools/sumolib/geomhelper.py \
+ tools/trigger/csv2vss.py \
+ tools/turn-defs/connections.py \
+ tools/turn-defs/turndefinitions.py \
+ tools/xml/xml2csv.py \
+ tools/xml/xsd.py \
+]
+
+set python_tutorials [list \
+ docs/tutorial/city_mobil/constants.py \
+ docs/tutorial/city_mobil/statistics.py \
+ docs/tutorial/hello/runner.py \
+ docs/tutorial/output_parsing/runner.py \
+ docs/tutorial/quickstart/runner.py \
+ docs/tutorial/san_pablo_dam/runner.py \
+ docs/tutorial/traci_tls/runner.py \
+]
+
+set perl_scripts [list \
</ins><span class="cx"> tools/trip/removeGeometryInTrips.pl \
</span><span class="cx"> tools/trip/removeTripsIfNotInInterval.pl \
</span><del>- tools/trip/splitTripsByHours.pl ]
</del><ins>+ tools/trip/splitTripsByHours.pl \
+]
</ins><span class="cx">
</span><span class="cx"> # required for the gui to be enabled
</span><span class="cx"> configure.args-append \
</span><span class="lines">@@ -222,6 +260,10 @@
</span><span class="cx"> xinstall -m 755 ${worksrcpath}/tools/lib/stop.png ${destroot}${python_lib}/sumolib/
</span><span class="cx"> xinstall -m 755 ${worksrcpath}/tools/lib/testUtil.py ${destroot}${python_lib}/sumolib/
</span><span class="cx">
</span><ins>+ foreach f $python_libs {
+ xinstall -m 755 ${worksrcpath}/${f} ${destroot}${python_lib}/sumolib/
+ }
+
</ins><span class="cx"> foreach f [list {*}$python_scripts {*}$perl_scripts] {
</span><span class="cx"> # convert file names to use dash rather than underscore and remove trailing .py or .pl
</span><span class="cx"> set x [string map [list _ -] [file rootname [file tail ${f}]]]
</span></span></pre>
</div>
</div>
</body>
</html>