From: arno Date: Tue, 22 Mar 2011 17:06:04 +0000 (+0100) Subject: update OpenLayers and put syj.cfg outside OpenLayers directory X-Git-Tag: v0.3~5 X-Git-Url: https://dev.renevier.net/?a=commitdiff_plain;ds=sidebyside;h=66723e262e0b42b6fb50ba781be6ad3b06ee3fb5;hp=e534c17db2f3986751f4a96900e4aaae56d34873;p=syj.git update OpenLayers and put syj.cfg outside OpenLayers directory --- diff --git a/public/modifiablepath b/public/modifiablepath index 46b219e..e0ddb08 160000 --- a/public/modifiablepath +++ b/public/modifiablepath @@ -1 +1 @@ -Subproject commit 46b219eaa9f256817614f6277009c65edb2c6b82 +Subproject commit e0ddb083172efd0ac1af0436e695ac180d3d7b74 diff --git a/public/openlayers b/public/openlayers index 6f1f6b6..9c222d9 160000 --- a/public/openlayers +++ b/public/openlayers @@ -1 +1 @@ -Subproject commit 6f1f6b616d1567853c0dc7a34bab822ba60daf22 +Subproject commit 9c222d97bff8c4546b3a4947cc9bb79419307c5e diff --git a/scripts/release.py b/scripts/release.py index a1d30e4..ca83a2a 100755 --- a/scripts/release.py +++ b/scripts/release.py @@ -26,9 +26,9 @@ def genscripts(): shutil.copy(path, tmpdir) # build OpenLayers.js - subprocess.call(['python', 'buildUncompressed.py', 'syj'], + subprocess.call(['python', 'buildUncompressed.py', + pathjoin(os.getcwd(), "scripts/syj"), pathjoin(tmpdir, "OpenLayers.js")], cwd = 'public/openlayers/openlayers/build') - shutil.copy('public/openlayers/openlayers/build/OpenLayers.js', tmpdir) config = ConfigParser.ConfigParser() os.makedirs(pathjoin(TARGET, 'public/js')) diff --git a/scripts/syj.cfg b/scripts/syj.cfg new file mode 100644 index 0000000..925b03f --- /dev/null +++ b/scripts/syj.cfg @@ -0,0 +1,46 @@ +# This is the build with files needed by SYJ. + +[first] +OpenLayers/SingleFile.js +OpenLayers.js +OpenLayers/BaseTypes.js +OpenLayers/BaseTypes/Class.js +OpenLayers/Util.js + +[last] + +[include] +OpenLayers/BaseTypes/Pixel.js +OpenLayers/BaseTypes/Element.js +OpenLayers/Console.js +OpenLayers/Control/Attribution.js +OpenLayers/Control/DrawFeature.js +OpenLayers/Control/Navigation.js +OpenLayers/Control/DragFeature.js +OpenLayers/Control/PanZoom.js +OpenLayers/Control/Style.js +OpenLayers/Control/StyleMap.js +OpenLayers/Handler/Feature.js +OpenLayers/Handler/Keyboard.js +OpenLayers/Handler/Point.js +OpenLayers/Geometry/LineString.js +OpenLayers/Geometry/Collection.js +OpenLayers/Geometry/Point.js +OpenLayers/Feature/Vector.js +OpenLayers/Format/WKT.js +OpenLayers/Format/KML.js +OpenLayers/Format/GPX.js +OpenLayers/Layer/GML.js +OpenLayers/Layer/SphericalMercator.js +OpenLayers/Layer/XYZ.js +OpenLayers/LonLat.js +OpenLayers/Map.js +OpenLayers/Projection.js +OpenLayers/Renderer/SVG.js +OpenLayers/Renderer/Canvas.js +OpenLayers/Renderer/VML.js +OpenLayers/Lang/en.js +OpenLayers/Lang/fr.js +OpenLayers/Lang/ja.js + +[exclude]