Changeset 7460

Show
Ignore:
Timestamp:
02/27/07 11:49:16 (18 months ago)
Author:
jburke
Message:

(merge from 0.4 branch) References #2366. Got web build cache to work, removed dojo.widget.Editor from editor.profile.js, and removed extraneous copyright from bootstrap1.js

Location:
trunk
Files:
5 modified
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/buildscripts/makeDojoJsWeb.js

    r7451 r7460  
    5050        dojo.require("dojo.crypto.MD5"); 
    5151 
    52         var buildSigDir = dojo.crypto.MD5.compute(dependencyResult.depList.sort().join(","), dojo.crypto.outputTypes.Hex); 
     52        var buildSigDir = dojo.crypto.MD5.compute(depList.sort().join(","), dojo.crypto.outputTypes.Hex); 
    5353        try{ 
    5454                var contents = buildUtil.makeDojoJs(dependencyResult, version).dojoContents; 
    … …  
    8989                result = "dirFile: " + dirFile.getAbsolutePath() + ", dirsOK: " + dirsOk; 
    9090                 
     91                //Create build contents file 
     92                var buildContents = dependencyResult.provideList.sort().join("\n"); 
     93 
    9194                //Save files to disk 
    9295                buildUtil.saveUtf8File(buildCachePath + "dojo.js", contents); 
    9396                buildUtil.saveUtf8File(buildCachePath + "compressed/dojo.js", compressedContents); 
     97                buildUtil.saveUtf8File(buildCachePath + "build.txt", buildContents); 
    9498                 
    9599                result = "OK"; 
    96100        }catch(e){ 
    97                 result += "ERROR: " + e;         
     101                result = "ERROR: " + e;  
    98102        } 
    99103 

  • trunk/buildscripts/profiles/editor.profile.js

    r3930 r7460  
    44        "dojo.event.*", 
    55        "dojo.lfx.*", 
    6         "dojo.widget.Editor", 
    76        "dojo.widget.Editor2", 
    87]; 

  • trunk/buildscripts/webbuild/index.html

    r7451 r7460  
    11<html> 
     2<head> 
    23<style type="text/css"> 
    34 
    … …  
    125126                outputNode.innerHTML = ""; 
    126127        } 
    127          
     128 
    128129        function getCachedBuildUrl(depList){ 
    129130                var doCompression = document.masterForm.doCompression[1].checked ? true : false; 
    130                 var sortedFileList = depList.sort().join(","); 
     131                //Create sorted file list. slice() is used to get a copy of the array. 
     132                var sortedFileList = depList.slice().sort().join(","); 
    131133                var buildKey = dojo.crypto.MD5.compute(sortedFileList, dojo.crypto.outputTypes.Hex); 
    132134                return "dojobuilds/" + buildKey + (doCompression ? "/compressed" : "") + "/dojo.js"; 
    … …  
    259261                 
    260262                //Set up XD Dojo URL if available. 
    261                 xdDojoUrl = "@XD_DOJO_URL@"; 
     263                window.xdDojoUrl = "@XD_DOJO_URL@"; 
    262264                if(xdDojoUrl != ("@" + "XD_DOJO_URL" + "@")){ 
    263265                        dojo.byId("xdDojoUrl").innerHTML = xdDojoUrl; 
    … …  
    267269                } 
    268270                 
    269                 version = "@VERSION@"; 
     271                window.version = "@VERSION@"; 
    270272                if(xdDojoUrl == ("@" + "VERSION" + "@")){ 
    271273                        version = ""; 
    … …  
    419421} 
    420422</script> 
    421  
     423</head> 
    422424<body> 
    423425<form name="masterForm" onsubmit="return false"> 

  • trunk/buildscripts/webbuild/webbuild.js

    r7415 r7460  
    77//Define some methods that are defined in Rhino, but we need web equivalents 
    88//in order for the build scripts to work. 
    9 print = function(message){ 
    10         parent.output(message); 
    11 } 
    12  
    139buildUtil.readFile = readText = readFile = function(uri){ 
    1410        return dojo.hostenv.getText(uri); 

  • trunk/src/bootstrap1.js

    r6986 r7460  
    1 /** 
    2 * @file bootstrap1.js 
    3 * 
    4 * summary: First file that is loaded that 'bootstraps' the entire dojo library suite. 
    5 * note:  Must run before hostenv_*.js file. 
    6 * 
    7 * @author  Copyright 2004 Mark D. Anderson (mda@discerning.com) 
    8 * TODOC: should the copyright be changed to Dojo Foundation? 
    9 * @license Licensed under the Academic Free License 2.1 http://www.opensource.org/licenses/afl-2.1.php 
    10 * 
    11 * $Id$ 
    12 */ 
    13  
    141// TODOC: HOW TO DOC THE BELOW? 
    152// @global: djConfig