Changeset 7264

Show
Ignore:
Timestamp:
02/08/07 23:24:26 (22 months ago)
Author:
jburke
Message:

(merge from branch) References #2366. Fix small issues with build script.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/buildscripts/webbuild/webbuild.sh

    r7184 r7264  
    33# Define variables used for rest of the script 
    44version=0.4.2ALPHA 
    5 xdDojoUrl=http://dojotoolkit.org/~jburke/$version 
     5xdDojoUrl=http://dojotoolkit.org/~jburke/webbuild/$version 
    66versionSuffix=xdomain 
    77 
    … …  
    1818#Do xdajax build. 
    1919#Mark the dojo.js has an xdomain build, complete with xdomain path for Dojo. 
    20 ant -Dprofile=ajax -DreleaseName=$version-xdajax -Dversion=$version$versionSuffix -DxdDojoUrl=$xdDojoUrl clean release intern-strings xd-dojo-config 
     20ant -Dprofile=ajax -DreleaseName=$version -DdojoLoader=xdomain -Dversion=$version$versionSuffix -DxdDojoUrl=$xdDojoUrl clean release intern-strings xd-dojo-config 
    2121 
    2222#src folders/buildscripts for the webbuild stuff. 
    … …  
    3636cp -r ../../Storage_version8.swf . 
    3737 
    38 #Stamp the web build with the xd Dojo URL. 
    39 #xxx 
    40  
     38#Stamp the web build with the xd Dojo URL and version. 
    4139cd buildscripts/webbuild 
    42 cat index.html | sed "s/@VERSION@/$version/g" | sed "s/@XD_DOJO_URL@/$xdDojoUrl/g" > index.out.html 
     40cat index.html | sed "s/@VERSION@/$version/g" | sed "s|@XD_DOJO_URL@|$xdDojoUrl|g" > index.out.html 
    4341mv index.out.html index.html 
    4442 
    … …  
    4947 
    5048#Now in release folder. Bundle it all up. 
    51 zip -r dojo-$version.zip $version-xdajax/* web/* 
     49zip -r dojo-$version.zip $version/* web/* 
    5250mv dojo-$version.zip ../.. 
    5351