You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by jm...@apache.org on 2006/08/17 00:02:18 UTC
svn commit: r432074 - /incubator/xap/trunk/buildscripts/buildUtil.js
Author: jmargaris
Date: Wed Aug 16 17:02:17 2006
New Revision: 432074
URL: http://svn.apache.org/viewvc?rev=432074&view=rev
Log:
bugfix for ' being parsed improperly in requires
Modified:
incubator/xap/trunk/buildscripts/buildUtil.js
Modified: incubator/xap/trunk/buildscripts/buildUtil.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/buildscripts/buildUtil.js?rev=432074&r1=432073&r2=432074&view=diff
==============================================================================
--- incubator/xap/trunk/buildscripts/buildUtil.js (original)
+++ incubator/xap/trunk/buildscripts/buildUtil.js Wed Aug 16 17:02:17 2006
@@ -24,6 +24,7 @@
}
var dj_global = {};
+
load("../src/dojo/src/bootstrap1.js");
load("../src/dojo/src/loader.js");
load("../src/dojo/src/hostenv_rhino.js");
@@ -115,7 +116,7 @@
var tmp;
RegExp.lastIndex = 0;
//var testExp = /dojo.(hostenv.loadModule|hostenv.require|require|kwCompoundRequire|hostenv.conditionalLoadModule|hostenv.startPackage|provide)\([\w\W]*?\)/mg;
- var testExp = /(Xap.require\(\s*"[\w\W]*?\))|(Xap.provide\([\w\W]*?\))|(dojo.(hostenv.loadModule|hostenv.require|require|kwCompoundRequire|hostenv.conditionalLoadModule|hostenv.startPackage|provide)\([\w\W]*?\))/mg;
+ var testExp = /(Xap.require\(\s*("|')[\w\W]*?\))|(Xap.provide\([\w\W]*?\))|(dojo.(hostenv.loadModule|hostenv.require|require|kwCompoundRequire|hostenv.conditionalLoadModule|hostenv.startPackage|provide)\([\w\W]*?\))/mg;
while ((tmp = testExp.exec(contents)) != null){
deps.push(tmp[0]);