Changeset 241

Show
Ignore:
Timestamp:
02/13/08 17:53:10 (1 year ago)
Author:
sypasche
Message:

Reorganize release directory layout, support for resources (images, ...) (closes #79)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/MapFish/client/build/build.sh

    r240 r241  
    1919# 
    2020 
     21set -e 
     22 
    2123# 
    2224# Variables 
    …… 
    3739# MapFish.js build 
    3840# 
     41mapfishpath="${buildpath}/../mfbase/mapfish" 
     42if [ -d ${releasepath} ]; then 
     43    ${rm} -rf ${releasepath} 
     44fi 
     45 
     46mapfishreleasepath="${releasepath}/mapfish" 
     47${mkdir} -p ${mapfishreleasepath} 
     48(cd ${buildpath} && ${python} build.py -c mapfish-widgets.cfg -o ${mapfishreleasepath}/MapFish.js) 
     49 
     50# MapFish resources 
     51${cp} -r "${mapfishpath}/img" ${mapfishreleasepath} 
     52 
     53# OpenLayers resources 
    3954openlayerspath="${buildpath}/../mfbase/openlayers" 
     55openlayersreleasepath="${releasepath}/openlayers" 
    4056 
    41 ${mkdir} -p ${releasepath} 
    42 (cd ${buildpath} && ${python} build.py -c mapfish-widgets.cfg -o ${releasepath}/MapFish.js) 
    43 ${rm} -rf "${releasepath}/img" && ${cp} -r "${openlayerspath}/img" ${releasepath} 
    44 ${rm} -rf "${releasepath}/theme" && ${cp} -r "${openlayerspath}/theme" ${releasepath} 
     57mkdir ${openlayersreleasepath} 
     58${cp} -r "${openlayerspath}/img" ${openlayersreleasepath} 
     59${cp} -r "${openlayerspath}/theme" ${openlayersreleasepath} 
    4560 
    4661# 

  • trunk/MapFish/client/mfbase/mapfish/MapFish.js

    r238 r241  
    4545         * {String} Relative path of this script. 
    4646         */ 
    47         _scriptName: (!singleFile) ? "mapfish/MapFish.js" : "MapFish.js", 
     47        _scriptName: "MapFish.js", 
    4848 
    4949        /** 
    …… 
    114114 
    115115        var allScriptTags = ""; 
    116         var host = mapfish._getScriptLocation() + "mapfish/"; 
     116        var host = mapfish._getScriptLocation(); 
    117117     
    118118        for (var i = 0; i < jsfiles.length; i++) { 

  • trunk/MapFish/client/mfbase/mapfish/SingleFile.js

    r164 r241  
    2020/* 
    2121 * This file is to be included in the [first] section of MapFish build 
    22  * config file. 
     22 * config file, but after OpenLayers initialization files. 
    2323 */ 
    2424 
    …… 
    4646    if (foolOpenLayers) { 
    4747        // poor OpenLayers! 
    48         window.OpenLayers._scriptName = "MapFish.js"; 
     48        window.OpenLayers._getScriptLocation = function() { 
     49            return mapfish._getScriptLocation() + "../openlayers/"; 
     50        } 
    4951    } 
    5052})(); 

  • trunk/MapFishSample/mapfishsample/public/demos/c2corg/search.html

    r149 r241  
    1111                      parseOnLoad: true}; 
    1212      // TODO: remove once migrated 
    13       var gMfLocation = "../../mfbase/"; 
     13      var gMfLocation = "../../mfbase/mapfish/"; 
    1414    </script> 
    1515     
    …… 
    2222    <script type="text/javascript" src="../../mfbase/ext/ext-all.js"></script> 
    2323    <!-- TODO: use this one once migrated 
    24     <script type="text/javascript" src="../../mfbase/release/MapFish.js"></script> 
     24    <script type="text/javascript" src="../../mfbase/release/mapfish/MapFish.js"></script> 
    2525    --> 
    2626    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/demos/routing/epfl.html

    r149 r241  
    1515                      parseOnLoad: true}; 
    1616      // TODO: remove once migrated 
    17       var gMfLocation = "../../mfbase/"; 
     17      var gMfLocation = "../../mfbase/mapfish/"; 
    1818    </script> 
    1919 
    …… 
    2626    <script type="text/javascript" src="../../mfbase/ext/ext-all.js"></script> 
    2727    <!-- TODO: use this one once migrated 
    28     <script type="text/javascript" src="../../mfbase/release/MapFish.js"></script> 
     28    <script type="text/javascript" src="../../mfbase/release/mapfish/MapFish.js"></script> 
    2929    --> 
    3030    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/demos/world_factbk/geostat.html

    r149 r241  
    1111                      parseOnLoad: true}; 
    1212      // TODO: remove once migrated 
    13       var gMfLocation = "../../mfbase/"; 
     13      var gMfLocation = "../../mfbase/mapfish/"; 
    1414    </script> 
    1515  
    …… 
    2222    <script type="text/javascript" src="../../mfbase/ext/ext-all.js"></script> 
    2323    <!-- TODO: use this one once migrated 
    24     <script type="text/javascript" src="../../mfbase/release/MapFish.js"></script> 
     24    <script type="text/javascript" src="../../mfbase/release/mapfish/MapFish.js"></script> 
    2525    --> 
    2626    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/geostat/choropleths.html

    r192 r241  
    1414      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1515      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    16       var gMfLocation = "../../mfbase/"; 
     16      var gMfLocation = "../../mfbase/mapfish/"; 
    1717    </script> 
    1818    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/geostat/layout.html

    r192 r241  
    1313      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1414      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    15       var gMfLocation = "../../mfbase/"; 
     15      var gMfLocation = "../../mfbase/mapfish/"; 
    1616    </script> 
    1717    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/geostat/proportionalSymbols.html

    r191 r241  
    1414      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1515      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    16       var gMfLocation = "../../mfbase/"; 
     16      var gMfLocation = "../../mfbase/mapfish/"; 
    1717    </script> 
    1818    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/map/layout.html

    r184 r241  
    1313      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1414      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    15       var gMfLocation = "../../mfbase/"; 
     15      var gMfLocation = "../../mfbase/mapfish/"; 
    1616    </script> 
    1717    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/map/layout_spherical_mercator.html

    r177 r241  
    1313      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1414      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    15       var gMfLocation = "../../mfbase/"; 
     15      var gMfLocation = "../../mfbase/mapfish/"; 
    1616    </script> 
    1717    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/map/toolbar.html

    r181 r241  
    1515      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1616      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    17       var gMfLocation = "../../mfbase/"; 
     17      var gMfLocation = "../../mfbase/mapfish/"; 
    1818    </script> 
    1919    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/map/window.html

    r234 r241  
    1313      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1414      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    15       var gMfLocation = "../../mfbase/"; 
     15      var gMfLocation = "../../mfbase/mapfish/"; 
    1616    </script> 
    1717    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/search/c2corg_ext.html

    r229 r241  
    1515      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1616      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    17       var gMfLocation = "../../mfbase/"; 
     17      var gMfLocation = "../../mfbase/mapfish/"; 
    1818    </script> 
    1919    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/tree/tree_automatic.html

    r171 r241  
    1313      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1414      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    15       var gMfLocation = "../../mfbase/"; 
     15      var gMfLocation = "../../mfbase/mapfish/"; 
    1616    </script> 
    1717    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/tree/tree_reorder.html

    r218 r241  
    1313      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1414      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    15       var gMfLocation = "../../mfbase/"; 
     15      var gMfLocation = "../../mfbase/mapfish/"; 
    1616    </script> 
    1717    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/tree/tree_standalone.html

    r171 r241  
    1313      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1414      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    15       var gMfLocation = "../../mfbase/"; 
     15      var gMfLocation = "../../mfbase/mapfish/"; 
    1616    </script> 
    1717    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/tree/tree_user_model.html

    r171 r241  
    1313      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1414      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    15       var gMfLocation = "../../mfbase/"; 
     15      var gMfLocation = "../../mfbase/mapfish/"; 
    1616    </script> 
    1717    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script> 

  • trunk/MapFishSample/mapfishsample/public/examples/tree/tree_user_model_complex.html

    r227 r241  
    1313      // Because of a bug in Firefox 2 we need to specify the MapFish base path. 
    1414      // See https://bugzilla.mozilla.org/show_bug.cgi?id=351282 
    15       var gMfLocation = "../../mfbase/"; 
     15      var gMfLocation = "../../mfbase/mapfish/"; 
    1616    </script> 
    1717    <script type="text/javascript" src="../../mfbase/mapfish/MapFish.js"></script>