Skip to content

Instantly share code, notes, and snippets.

@leeight

leeight/edp-1.0.0.patch

Created April 15, 2014 04:18
Show Gist options
  • Save leeight/10701712 to your computer and use it in GitHub Desktop.
Save leeight/10701712 to your computer and use it in GitHub Desktop.
Download ZIP
app/ecom/fe/trunk/vs-mid-edu/booking
Raw
edp-1.0.0.patch
diff --git a/booking/.gitignore b/booking/.gitignore
new file mode 100644
index 0000000..73960af
--- /dev/null
+++ b/booking/.gitignore
@@ -0,0 +1,2 @@
+templates_c/*.php
+output
diff --git a/booking/edp-build-config.js b/booking/edp-build-config.js
index 98657c7..d4c7788 100644
--- a/booking/edp-build-config.js
+++ b/booking/edp-build-config.js
@@ -8,44 +8,42 @@ var pageEntries = 'html,htm,phtml,tpl,vm';
exports.getProcessors = function () {
return [
- new LessCompiler( {
- entryExtnames: pageEntries
- } ),
- new CssCompressor(),
- new ModuleCompiler( {
- configFile: 'module.conf',
- entryExtnames: moduleEntries
- } ),
- new JsCompressor(),
- new PathMapper( {
- replacements: [
- { type: 'html', tag: 'link', attribute: 'href', extnames: pageEntries },
- { type: 'html', tag: 'img', attribute: 'src', extnames: pageEntries },
- { type: 'html', tag: 'script', attribute: 'src', extnames: pageEntries },
- { extnames: moduleEntries, replacer: 'module-config' }
+ new LessCompiler({
+ files: [
+ 'src/css/main.less'
],
- from: 'src',
- to: 'asset'
- } )
+ pageFiles: [
+ 'templates/left_side.tpl'
+ ]
+ }),
+ new CssCompressor({
+ files: [
+ 'src/css/main.less',
+ '*.css'
+ ]
+ }),
+ new ModuleCompiler(),
+ new JsCompressor(),
+ new PathMapper()
];
};
exports.exclude = [
- '/tool',
- '/doc',
- '/test',
- '/module.conf',
- '/dep/packages.manifest',
- '/dep/*/*/test',
- '/dep/*/*/doc',
- '/dep/*/*/demo',
- '/dep/*/*/example',
- '/dep/*/*/tool',
- '/dep/*/*/*.md',
- '/dep/*/*/*.npmignore',
- '/dep/*/*/package.json',
- '/edp-*',
- '/.edpproj',
+ 'tool',
+ 'doc',
+ 'test',
+ 'module.conf',
+ 'dep/packages.manifest',
+ 'dep/*/*/test',
+ 'dep/*/*/doc',
+ 'dep/*/*/demo',
+ 'dep/*/*/example',
+ 'dep/*/*/tool',
+ 'dep/*/*/*.md',
+ 'dep/*/*/*.npmignore',
+ 'dep/*/*/package.json',
+ 'edp-*',
+ '.edpproj',
'.svn',
'.git',
'.gitignore',
@@ -57,11 +55,11 @@ exports.exclude = [
'*.tmp',
'*.bak',
'*.swp',
- '/templates_c',
+ 'templates_c',
'*.php',
'*.bat',
'*.log',
- '/libs'
+ 'libs'
];
exports.injectProcessor = function ( processors ) {
diff --git a/booking/edp-webserver-config.js b/booking/edp-webserver-config.js
index 49ce2d0..5d83836 100644
--- a/booking/edp-webserver-config.js
+++ b/booking/edp-webserver-config.js
@@ -36,6 +36,12 @@ exports.getLocations = function () {
less()
]
},
+ {
+ location: /\.php$/,
+ handler: [
+ php('php-cgi')
+ ]
+ },
{
location: /^.*$/,
handler: [
diff --git a/booking/module.conf b/booking/module.conf
index 5db58e3..ae1ce28 100644
--- a/booking/module.conf
+++ b/booking/module.conf
@@ -1,10 +1,26 @@
{
"baseUrl": "src",
- "paths": {},
+ "paths": {
+ "pszx": "http://s1.bdstatic.com/r/www/cache/biz/ecom/ui/20131226/pszx"
+ },
"packages": [
{
- "name": "est",
- "location": "dep/est/1.0.0/src"
+ "name": "underscore",
+ "location": "../dep/underscore/1.4.4/src",
+ "main": "underscore"
+ },
+ {
+ "name": "er",
+ "location": "../dep/er/3.0.2/src",
+ "main": "main"
+ },
+ {
+ "name": "zxui",
+ "location": "../dep/zxui/0.4.3/src/ui",
+ "main": "Control"
}
- ]
-}
\ No newline at end of file
+ ],
+ "combine": {
+ "left_side": 1
+ }
+}
diff --git a/booking/templates/left_side.tpl b/booking/templates/left_side.tpl
index 85f1fae..3b52559 100644
--- a/booking/templates/left_side.tpl
+++ b/booking/templates/left_side.tpl
@@ -110,11 +110,6 @@
name: 'zxui',
location: '../dep/zxui/0.4.3/src/ui',
main: 'Control'
- },
- {
- name: 'log',
- location: '../dep/log',
- main: 'log'
}
]
});
@@ -124,4 +119,4 @@
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/develop/.gitignore b/develop/.gitignore
new file mode 100644
index 0000000..3314617
--- /dev/null
+++ b/develop/.gitignore
@@ -0,0 +1,3 @@
+libs
+mock/templates_c
+output
diff --git a/develop/edp-build-config.js b/develop/edp-build-config.js
index 1aa01f5..7445b84 100644
--- a/develop/edp-build-config.js
+++ b/develop/edp-build-config.js
@@ -11,11 +11,7 @@ exports.getProcessors = function () {
return [
new LessCompiler( {
- entryExtnames: pageEntries,
- exclude: [
- '*.less',
- ],
- include: [
+ files: [
'src/css/index.less',
'src/css/org.less',
'src/css/shequ.less',
@@ -33,19 +29,23 @@ exports.getProcessors = function () {
'src/css/new-index.less'
]
} ),
- new CssCompressor(),
+ new CssCompressor({
+ files: [
+ 'src/css/**/*.less',
+ '*.css'
+ ]
+ }),
new ModuleCompiler( {
- configFile: 'module.conf',
- entryExtnames: moduleEntries,
- exclude: [
- 'src/common/feedback.js',
- 'src/common/feedback_upload.js',
- 'src/external/common/feedback_upload.js',
- 'src/external/common/feedback.js',
- 'src/external/config.js'
+ files: [
+ '*.js',
+ '!src/common/feedback.js',
+ '!src/common/feedback_upload.js',
+ '!src/external/common/feedback_upload.js',
+ '!src/external/common/feedback.js',
+ '!src/external/config.js'
]
} ),
- new JsCompressor(),
+ // new JsCompressor(),
new Versioning({
cssFilePaths: [
'src/css/index.less',
@@ -68,48 +68,33 @@ exports.getProcessors = function () {
pathPrefixDepth: 3,
output: '\'esl_resource_version\''
}),
- new PathMapper( {
- replacements: [
- { type: 'html', tag: 'link', attribute: 'href', extnames: pageEntries },
- { type: 'html', tag: 'img', attribute: 'src', extnames: pageEntries },
- { type: 'html', tag: 'script', attribute: 'src', extnames: pageEntries },
- {
- extnames: moduleEntries,
- replacer: 'module-config'
- }
- ],
- from: 'src',
- to: 'asset',
- exclude: [
-
- ]
- } )
+ new PathMapper()
];
};
exports.exclude = [
- '/tool',
- '/doc',
- '/test',
- '/asset',
- '/mock',
+ 'tool',
+ 'doc',
+ 'test',
+ 'asset',
+ 'mock',
// 和php相关的不用build -start
- '/cache',
- '/configs',
- '/plugins',
+ 'cache',
+ 'configs',
+ 'plugins',
'templates_c',
'create-data.php',
// 和php相关的不用build -end
- '/module.conf',
- '/dep/packages.manifest',
- '/dep/*/*/test',
- '/dep/*/*/doc',
- '/dep/*/*/demo',
- '/dep/*/*/tool',
- '/dep/*/*/*.md',
- '/dep/*/*/package.json',
- '/edp-*',
- '/.edpproj',
+ 'module.conf',
+ 'dep/packages.manifest',
+ 'dep/*/*/test',
+ 'dep/*/*/doc',
+ 'dep/*/*/demo',
+ 'dep/*/*/tool',
+ 'dep/*/*/*.md',
+ 'dep/*/*/package.json',
+ 'edp-*',
+ '.edpproj',
'.svn',
'.git',
'.gitignore',
diff --git a/develop/module.conf b/develop/module.conf
index 4404d57..55a9b86 100644
--- a/develop/module.conf
+++ b/develop/module.conf
@@ -1,7 +1,7 @@
{
"baseUrl": "src",
"paths": {
- "edu/external": "src/external"
+ "edu/external": "external"
},
"packages": [
{
@@ -13,15 +13,21 @@
"name": "zxui",
"location": "../dep/zxui/0.4.3/src/ui",
"main": "Control"
+ },
+ {
+ "name": "underscore",
+ "location": "../dep/underscore/1.4.4/src",
+ "main": "underscore"
}
],
"combine": {
- "src/index": 1,
- "src/course_index": 1,
- "src/org_index": 1,
- "src/wenku": 1,
- "src/abroad_search": 1,
- "edu/external/dxt": 1
+ "index": 1,
+ "new_index": 1,
+ "course_index": 1,
+ "org_index": 1,
+ "wenku": 1,
+ "abroad_search": 1,
+ "external/dxt": 1
}
}
diff --git a/develop/src/common/data.js b/develop/src/common/data.js
index dadd7c2..e7acdfb 100644
--- a/develop/src/common/data.js
+++ b/develop/src/common/data.js
@@ -4,7 +4,7 @@
*/
define(function (require) {
- var URL = require('../lib/er/URL');
+ var URL = require('er/URL');
// 存储本地数据
diff --git a/develop/src/common/filter.js b/develop/src/common/filter.js
index e0157be..564bf85 100644
--- a/develop/src/common/filter.js
+++ b/develop/src/common/filter.js
@@ -4,12 +4,12 @@
*/
define(function (require, exports) {
- var Observable = require('../lib/er/Observable');
- var Model = require('../lib/er/Model');
- var URL = require('../lib/er/URL');
- var template = require('../lib/er/template');
+ var Observable = require('er/Observable');
+ var Model = require('er/Model');
+ var URL = require('er/URL');
+ var template = require('er/template');
- var underscore = require('../lib/underscore/underscore');
+ var underscore = require('underscore');
var util = require('./util');
var data = require('./data');
@@ -138,4 +138,4 @@ define(function (require, exports) {
-});
\ No newline at end of file
+});
diff --git a/develop/src/common/header.js b/develop/src/common/header.js
index 1fed0f7..021ca15 100644
--- a/develop/src/common/header.js
+++ b/develop/src/common/header.js
@@ -14,8 +14,8 @@ define(function (require, exports) {
* #
*/
- var Observable = require('../lib/er/Observable');
- var underscore = require('../lib/underscore/underscore');
+ var Observable = require('er/Observable');
+ var underscore = require('underscore');
var City = require('./widget/City');
var Layer = require('./widget/Layer');
var data = require('./data');
@@ -162,4 +162,4 @@ define(function (require, exports) {
redirect.toCourse();
};
-});
\ No newline at end of file
+});
diff --git a/develop/src/common/log.js b/develop/src/common/log.js
index bf5dca0..275b87d 100644
--- a/develop/src/common/log.js
+++ b/develop/src/common/log.js
@@ -1,7 +1,7 @@
define(function (require) {
var data = require('./data');
- var loger = require('../lib/zxui/log');
+ var loger = require('zxui/log');
diff --git a/develop/src/common/pager.js b/develop/src/common/pager.js
index b61eab3..1122a2c 100644
--- a/develop/src/common/pager.js
+++ b/develop/src/common/pager.js
@@ -4,8 +4,8 @@
*/
define(function (require, exports) {
- var Observable = require('../lib/er/Observable');
- var Pager = require('../lib/zxui/Pager');
+ var Observable = require('er/Observable');
+ var Pager = require('zxui/Pager');
var data = require('./data');
var log = require('./log');
diff --git a/develop/src/common/redirect.js b/develop/src/common/redirect.js
index 067d72b..eb3f346 100644
--- a/develop/src/common/redirect.js
+++ b/develop/src/common/redirect.js
@@ -4,7 +4,7 @@
*/
define(function (require) {
- var URL = require('../lib/er/URL');
+ var URL = require('er/URL');
var data = require('./data');
@@ -358,4 +358,4 @@ define(function (require) {
}
};
-});
\ No newline at end of file
+});
diff --git a/develop/src/common/util.js b/develop/src/common/util.js
index be92598..5a2057d 100644
--- a/develop/src/common/util.js
+++ b/develop/src/common/util.js
@@ -4,10 +4,10 @@
*/
define( function (require) {
- var template = require('../lib/er/template');
- var Model = require('../lib/er/Model');
+ var template = require('er/template');
+ var Model = require('er/Model');
- var underscore = require('../lib/underscore/underscore');
+ var underscore = require('underscore');
var data = require('./data');
underscore.templateSettings = {
@@ -116,4 +116,4 @@ define( function (require) {
};
-} );
\ No newline at end of file
+} );
diff --git a/develop/src/common/widget/Slider.js b/develop/src/common/widget/Slider.js
index f862732..22a6468 100644
--- a/develop/src/common/widget/Slider.js
+++ b/develop/src/common/widget/Slider.js
@@ -4,8 +4,8 @@
*/
define(function (require) {
- var underscore = require('../../lib/underscore/underscore');
- var Observable = require('../../lib/er/Observable');
+ var underscore = require('underscore');
+ var Observable = require('er/Observable');
/**
* 幻灯片
diff --git a/develop/src/course_search.js b/develop/src/course_search.js
index 4a2f5cf..3d420d6 100644
--- a/develop/src/course_search.js
+++ b/develop/src/course_search.js
@@ -18,7 +18,7 @@ define(function (require, exports) {
// require('external/dxt');
var browser = require('common/browser');
var category = require('common/category');
- var URL = require('lib/er/URL');
+ var URL = require('er/URL');
// 顶部分页
var topPager = require('common/top_pager');
// 缓存frame变量，判断是中间页还是一站式
diff --git a/develop/src/external/common.js.lnk b/develop/src/external/common.js.lnk
deleted file mode 100644
index 925c9cb..0000000
Binary files a/develop/src/external/common.js.lnk and /dev/null differ
diff --git a/develop/src/external/common.lnk b/develop/src/external/common.lnk
deleted file mode 100644
index e01111e..0000000
Binary files a/develop/src/external/common.lnk and /dev/null differ
diff --git a/develop/src/external/config.js b/develop/src/external/config.js
index 4db546d..ab67fba 100644
--- a/develop/src/external/config.js
+++ b/develop/src/external/config.js
@@ -6,5 +6,22 @@ require.config({
js: 'http://i.baidu.com/asset/api1/js',
css: 'http://i.baidu.com/asset/api1/css',
ucvsApi: 'http://i.baidu.com/asset/api1/ucvsApi'
- }
-});
\ No newline at end of file
+ },
+ "packages": [
+ {
+ "name": "er",
+ "location": "../dep/er/3.0.2/src",
+ "main": "main"
+ },
+ {
+ "name": "zxui",
+ "location": "../dep/zxui/0.4.3/src/ui",
+ "main": "Control"
+ },
+ {
+ "name": "underscore",
+ "location": "../dep/underscore/1.4.4/src",
+ "main": "underscore"
+ }
+ ]
+});
diff --git a/develop/src/lib/er.lnk b/develop/src/lib/er.lnk
deleted file mode 100644
index cf456d5..0000000
Binary files a/develop/src/lib/er.lnk and /dev/null differ
diff --git a/develop/src/lib/underscore.lnk b/develop/src/lib/underscore.lnk
deleted file mode 100644
index 7f96b3c..0000000
Binary files a/develop/src/lib/underscore.lnk and /dev/null differ
diff --git a/develop/src/lib/zxui.lnk b/develop/src/lib/zxui.lnk
deleted file mode 100644
index a0c73f8..0000000
Binary files a/develop/src/lib/zxui.lnk and /dev/null differ
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment