[SCM] SUMO packaging. Simulation of Urban MObility. branch, master, updated. 4269d2174615810e4930b0b86c08771f6f166e27

Anton Gladky gladky.anton at gmail.com
Fri Apr 20 21:32:48 UTC 2012


The following commit has been merged in the master branch:
commit 4269d2174615810e4930b0b86c08771f6f166e27
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Apr 20 23:32:36 2012 +0200

    Remove eulerspiral patch.

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..2f37d6c
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,2 @@
+Files src/foreign/eulerspiral/* were removed due to license issue.
+Corresponding changes in the code were done with drop_eulerspiral.patch
diff --git a/debian/patches/drop_eulerspiral.patch b/debian/patches/drop_eulerspiral.patch
new file mode 100644
index 0000000..6cc2438
--- /dev/null
+++ b/debian/patches/drop_eulerspiral.patch
@@ -0,0 +1,136 @@
+Description: Remove eulerspiral source code due to license issues.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-04-20
+
+--- a/src/netimport/NIImporter_OpenDrive.cpp
++++ b/src/netimport/NIImporter_OpenDrive.cpp
+@@ -45,7 +45,6 @@
+ #include <utils/xml/SUMOXMLDefinitions.h>
+ #include <utils/geom/GeoConvHelper.h>
+ #include <utils/geom/GeomConvHelper.h>
+-#include <foreign/eulerspiral/euler.h>
+ #include <utils/options/OptionsCont.h>
+ #include <utils/common/FileHelpers.h>
+ #include <utils/xml/XMLSubSys.h>
+@@ -672,9 +671,6 @@
+                 case OPENDRIVE_GT_LINE:
+                     geom = geomFromLine(e, g);
+                     break;
+-                case OPENDRIVE_GT_SPIRAL:
+-                    geom = geomFromSpiral(e, g);
+-                    break;
+                 case OPENDRIVE_GT_ARC:
+                     geom = geomFromArc(e, g);
+                     break;
+@@ -705,23 +701,6 @@
+     return ret;
+ }
+ 
+-
+-std::vector<Position>
+-NIImporter_OpenDrive::geomFromSpiral(const OpenDriveEdge& e, const OpenDriveGeometry& g) {
+-    UNUSED_PARAMETER(e);
+-    std::vector<Position> ret;
+-    SUMOReal curveStart = g.params[0];
+-    SUMOReal curveEnd = g.params[1];
+-    Point2D<double> end;
+-    EulerSpiral s(Point2D<double>(g.x, g.y), g.hdg, curveStart, (curveEnd - curveStart) / g.length, g.length);
+-    std::vector<Point2D<double> > into;
+-    s.computeSpiral(into, 1.);
+-    for (std::vector<Point2D<double> >::iterator i = into.begin(); i != into.end(); ++i) {
+-        ret.push_back(Position((*i).getX(), (*i).getY()));
+-    }
+-    return ret;
+-}
+-
+ 
+ std::vector<Position>
+ NIImporter_OpenDrive::geomFromArc(const OpenDriveEdge& e, const OpenDriveGeometry& g) {
+--- a/src/netimport/NIImporter_OpenDrive.h
++++ b/src/netimport/NIImporter_OpenDrive.h
+@@ -386,7 +386,6 @@
+ 
+ 
+     static std::vector<Position> geomFromLine(const OpenDriveEdge& e, const OpenDriveGeometry& g) ;
+-    static std::vector<Position> geomFromSpiral(const OpenDriveEdge& e, const OpenDriveGeometry& g) ;
+     static std::vector<Position> geomFromArc(const OpenDriveEdge& e, const OpenDriveGeometry& g) ;
+     static std::vector<Position> geomFromPoly(const OpenDriveEdge& e, const OpenDriveGeometry& g) ;
+     static Position calculateStraightEndPoint(double hdg, double length, const Position& start) ;
+--- a/configure
++++ b/configure
+@@ -16774,7 +16774,7 @@
+ 
+ 
+ 
+-ac_config_files="$ac_config_files src/Makefile src/activitygen/Makefile src/activitygen/activities/Makefile src/activitygen/city/Makefile src/foreign/Makefile src/foreign/eulerspiral/Makefile src/foreign/gl2ps/Makefile src/foreign/mersenne/Makefile src/foreign/nvwa/Makefile src/foreign/polyfonts/Makefile src/foreign/rtree/Makefile src/foreign/tcpip/Makefile src/gui/Makefile src/gui/dialogs/Makefile src/guinetload/Makefile src/guisim/Makefile src/microsim/Makefile src/microsim/actions/Makefile src/microsim/cfmodels/Makefile src/microsim/devices/Makefile src/microsim/logging/Makefile src/microsim/output/Makefile src/microsim/traffic_lights/Makefile src/microsim/trigger/Makefile src/netbuild/Makefile src/netgen/Makefile src/netimport/Makefile src/netimport/vissim/Makefile src/netimport/vissim/tempstructs/Makefile src/netimport/vissim/typeloader/Makefile src/netload/Makefile src/netwrite/Makefile src/od2trips/Makefile src/polyconvert/Makefile src/router/Makefile src/dfrouter/Makefile src/duarouter/Makefile src/jtrrouter/Makefile src/traci_testclient/Makefile src/traci-server/Makefile src/utils/Makefile src/utils/common/Makefile src/utils/distribution/Makefile src/utils/foxtools/Makefile src/utils/geom/Makefile src/utils/gui/Makefile src/utils/gui/div/Makefile src/utils/gui/events/Makefile src/utils/gui/globjects/Makefile src/utils/gui/images/Makefile src/utils/gui/settings/Makefile src/utils/gui/tracker/Makefile src/utils/gui/windows/Makefile src/utils/importio/Makefile src/utils/iodevices/Makefile src/utils/options/Makefile src/utils/shapes/Makefile src/utils/xml/Makefile unittest/Makefile unittest/src/Makefile unittest/src/microsim/Makefile unittest/src/netbuild/Makefile unittest/src/utils/Makefile unittest/src/utils/common/Makefile unittest/src/utils/geom/Makefile unittest/src/utils/iodevices/Makefile bin/Makefile Makefile"
++ac_config_files="$ac_config_files src/Makefile src/activitygen/Makefile src/activitygen/activities/Makefile src/activitygen/city/Makefile src/foreign/Makefile src/foreign/gl2ps/Makefile src/foreign/mersenne/Makefile src/foreign/nvwa/Makefile src/foreign/polyfonts/Makefile src/foreign/rtree/Makefile src/foreign/tcpip/Makefile src/gui/Makefile src/gui/dialogs/Makefile src/guinetload/Makefile src/guisim/Makefile src/microsim/Makefile src/microsim/actions/Makefile src/microsim/cfmodels/Makefile src/microsim/devices/Makefile src/microsim/logging/Makefile src/microsim/output/Makefile src/microsim/traffic_lights/Makefile src/microsim/trigger/Makefile src/netbuild/Makefile src/netgen/Makefile src/netimport/Makefile src/netimport/vissim/Makefile src/netimport/vissim/tempstructs/Makefile src/netimport/vissim/typeloader/Makefile src/netload/Makefile src/netwrite/Makefile src/od2trips/Makefile src/polyconvert/Makefile src/router/Makefile src/dfrouter/Makefile src/duarouter/Makefile src/jtrrouter/Makefile src/traci_testclient/Makefile src/traci-server/Makefile src/utils/Makefile src/utils/common/Makefile src/utils/distribution/Makefile src/utils/foxtools/Makefile src/utils/geom/Makefile src/utils/gui/Makefile src/utils/gui/div/Makefile src/utils/gui/events/Makefile src/utils/gui/globjects/Makefile src/utils/gui/images/Makefile src/utils/gui/settings/Makefile src/utils/gui/tracker/Makefile src/utils/gui/windows/Makefile src/utils/importio/Makefile src/utils/iodevices/Makefile src/utils/options/Makefile src/utils/shapes/Makefile src/utils/xml/Makefile unittest/Makefile unittest/src/Makefile unittest/src/microsim/Makefile unittest/src/netbuild/Makefile unittest/src/utils/Makefile unittest/src/utils/common/Makefile unittest/src/utils/geom/Makefile unittest/src/utils/iodevices/Makefile bin/Makefile Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -17908,7 +17908,6 @@
+     "src/activitygen/activities/Makefile") CONFIG_FILES="$CONFIG_FILES src/activitygen/activities/Makefile" ;;
+     "src/activitygen/city/Makefile") CONFIG_FILES="$CONFIG_FILES src/activitygen/city/Makefile" ;;
+     "src/foreign/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/Makefile" ;;
+-    "src/foreign/eulerspiral/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/eulerspiral/Makefile" ;;
+     "src/foreign/gl2ps/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/gl2ps/Makefile" ;;
+     "src/foreign/mersenne/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/mersenne/Makefile" ;;
+     "src/foreign/nvwa/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreign/nvwa/Makefile" ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -433,7 +433,6 @@
+ src/activitygen/activities/Makefile
+ src/activitygen/city/Makefile
+ src/foreign/Makefile
+-src/foreign/eulerspiral/Makefile
+ src/foreign/gl2ps/Makefile
+ src/foreign/mersenne/Makefile
+ src/foreign/nvwa/Makefile
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -64,7 +64,7 @@
+ 	./netimport/vissim/tempstructs/libvissimtmpstr.a \
+ 	./netbuild/libnetbuild.a ./netwrite/libnetwrite.a \
+ 	./utils/distribution/libdistribution.a ./utils/geom/libgeom.a \
+-	./foreign/eulerspiral/libeulerspiral.a $(am__DEPENDENCIES_2) \
++	$(am__DEPENDENCIES_2) \
+ 	$(INTERNAL_LIBS) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ netconvert_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+@@ -366,7 +366,6 @@
+ ./netwrite/libnetwrite.a \
+ ./utils/distribution/libdistribution.a \
+ ./utils/geom/libgeom.a \
+-./foreign/eulerspiral/libeulerspiral.a \
+ $(COMMON_LIBS) \
+ $(INTERNAL_LIBS) \
+ $(GDAL_LIBS) \
+--- a/src/foreign/Makefile.in
++++ b/src/foreign/Makefile.in
+@@ -60,7 +60,7 @@
+ 	distdir
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = eulerspiral mersenne tcpip nvwa gl2ps polyfonts rtree
++DIST_SUBDIRS = mersenne tcpip nvwa gl2ps polyfonts rtree
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ am__relativize = \
+   dir0=`pwd`; \
+@@ -229,7 +229,7 @@
+ @CHECK_MEMORY_LEAKS_TRUE at MEMDIRS = nvwa
+ @WITH_GUI_TRUE at GUIDIRS = gl2ps polyfonts rtree
+ EXTRA_DIST = additional.txt
+-SUBDIRS = eulerspiral mersenne tcpip $(MEMDIRS) $(GUIDIRS) 
++SUBDIRS = mersenne tcpip $(MEMDIRS) $(GUIDIRS) 
+ all: all-recursive
+ 
+ .SUFFIXES:
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,7 +74,6 @@
+ ./netwrite/libnetwrite.a \
+ ./utils/distribution/libdistribution.a \
+ ./utils/geom/libgeom.a \
+-./foreign/eulerspiral/libeulerspiral.a \
+ $(COMMON_LIBS) \
+ $(INTERNAL_LIBS) \
+ $(GDAL_LIBS) \
diff --git a/debian/patches/series b/debian/patches/series
index 659a39b..058120a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_manpage_output.patch
 fix_format_not_a_string.patch
+drop_eulerspiral.patch

-- 
SUMO packaging. Simulation of Urban MObility.



More information about the debian-science-commits mailing list