Просмотр исходного кода

move lumbar and karma config files into build directory

Adam Shaw 11 лет назад
Родитель
Сommit
3514ce59eb
4 измененных файлов с 85 добавлено и 85 удалено
  1. 2 2
      Gruntfile.js
  2. 22 22
      build/karma.conf.js
  3. 61 0
      build/lumbar.json
  4. 0 61
      lumbar.json

+ 2 - 2
Gruntfile.js

@@ -68,7 +68,7 @@ module.exports = function(grunt) {
 	// assemble modules
 	config.lumbar = {
 		build: {
-			build: 'lumbar.json',
+			build: 'build/lumbar.json',
 			output: 'dist' // a directory. lumbar doesn't like trailing slash
 		}
 	};
@@ -147,7 +147,7 @@ module.exports = function(grunt) {
 
 	config.karma = {
 		options: {
-			configFile: 'karma.conf.js'
+			configFile: 'build/karma.conf.js'
 		},
 		url: {}, // you'll have to visit a URL in a browser
 		headless: { browsers: [ 'PhantomJS' ] },

+ 22 - 22
karma.conf.js → build/karma.conf.js

@@ -10,30 +10,30 @@ module.exports = function(config) {
 
 		// list of files / patterns to load in the browser
 		files: [
-			'lib/moment/moment.js',
-			'lib/jquery/jquery.js',
-			'lib/jquery-ui/ui/jquery-ui.js',
+			'../lib/moment/moment.js',
+			'../lib/jquery/jquery.js',
+			'../lib/jquery-ui/ui/jquery-ui.js',
 
 			// for jquery simulate
-			'lib/jquery-simulate-ext/libs/bililiteRange.js',
-			'lib/jquery-simulate-ext/libs/jquery.simulate.js',
-			'lib/jquery-simulate-ext/src/jquery.simulate.ext.js',
-			'lib/jquery-simulate-ext/src/jquery.simulate.drag-n-drop.js',
-			'lib/jquery-simulate-ext/src/jquery.simulate.key-sequence.js',
-			'lib/jquery-simulate-ext/src/jquery.simulate.key-combo.js',
-			'tests/lib/jquery-simulate-hacks.js', // needs to be last
-
-			'lib/jquery-mockjax/jquery.mockjax.js',
-			'lib/jasmine-jquery/lib/jasmine-jquery.js',
-			'lib/jasmine-fixture/dist/jasmine-fixture.js',
-			'tests/lib/jasmine-ext.js',
-
-			'dist/fullcalendar.js',
-			'dist/gcal.js',
-			'dist/lang-all.js',
-			'dist/fullcalendar.css',
-			'tests/base.css',
-			'tests/automated/*.js'
+			'../lib/jquery-simulate-ext/libs/bililiteRange.js',
+			'../lib/jquery-simulate-ext/libs/jquery.simulate.js',
+			'../lib/jquery-simulate-ext/src/jquery.simulate.ext.js',
+			'../lib/jquery-simulate-ext/src/jquery.simulate.drag-n-drop.js',
+			'../lib/jquery-simulate-ext/src/jquery.simulate.key-sequence.js',
+			'../lib/jquery-simulate-ext/src/jquery.simulate.key-combo.js',
+			'../tests/lib/jquery-simulate-hacks.js', // needs to be last
+
+			'../lib/jquery-mockjax/jquery.mockjax.js',
+			'../lib/jasmine-jquery/lib/jasmine-jquery.js',
+			'../lib/jasmine-fixture/dist/jasmine-fixture.js',
+			'../tests/lib/jasmine-ext.js',
+
+			'../dist/fullcalendar.js',
+			'../dist/gcal.js',
+			'../dist/lang-all.js',
+			'../dist/fullcalendar.css',
+			'../tests/base.css',
+			'../tests/automated/*.js'
 		],
 
 		// list of files to exclude

+ 61 - 0
build/lumbar.json

@@ -0,0 +1,61 @@
+{
+  "scope": "none",
+  "packages": {
+    "fullcalendar": {
+      "modules": [
+        "fullcalendar",
+        "fullcalendar.print",
+        "gcal"
+      ]
+    }
+  },
+  "modules": {
+    "fullcalendar": {
+      "scripts": [
+        "../src/intro.js",
+        "../src/defaults.js",
+        "../src/main.js",
+        "../src/lang.js",
+        "../src/Calendar.js",
+        "../src/Header.js",
+        "../src/EventManager.js",
+        "../src/util.js",
+        "../src/moment-ext.js",
+        "../src/date-formatting.js",
+        "../src/basic/MonthView.js",
+        "../src/basic/BasicWeekView.js",
+        "../src/basic/BasicDayView.js",
+        "../src/basic/BasicView.js",
+        "../src/basic/BasicEventRenderer.js",
+        "../src/agenda/AgendaWeekView.js",
+        "../src/agenda/AgendaDayView.js",
+        "../src/agenda/AgendaView.js",
+        "../src/agenda/AgendaEventRenderer.js",
+        "../src/common/View.js",
+        "../src/common/DayEventRenderer.js",
+        "../src/common/SelectionManager.js",
+        "../src/common/OverlayManager.js",
+        "../src/common/CoordinateGrid.js",
+        "../src/common/HoverListener.js",
+        "../src/common/HorizontalPositionCache.js",
+        "../src/outro.js"
+      ],
+      "styles": [
+        "../src/main.css",
+        "../src/common/common.css",
+        "../src/basic/basic.css",
+        "../src/agenda/agenda.css"
+      ]
+    },
+    "fullcalendar.print": {
+      "styles": [
+        "../src/common/print.css"
+      ]
+    },
+    "gcal": {
+      "scripts": [
+        "../src/gcal/gcal.js"
+      ]
+    }
+  }
+}

+ 0 - 61
lumbar.json

@@ -1,61 +0,0 @@
-{
-  "scope": "none",
-  "packages": {
-    "fullcalendar": {
-      "modules": [
-        "fullcalendar",
-        "fullcalendar.print",
-        "gcal"
-      ]
-    }
-  },
-  "modules": {
-    "fullcalendar": {
-      "scripts": [
-        "src/intro.js",
-        "src/defaults.js",
-        "src/main.js",
-        "src/lang.js",
-        "src/Calendar.js",
-        "src/Header.js",
-        "src/EventManager.js",
-        "src/util.js",
-        "src/moment-ext.js",
-        "src/date-formatting.js",
-        "src/basic/MonthView.js",
-        "src/basic/BasicWeekView.js",
-        "src/basic/BasicDayView.js",
-        "src/basic/BasicView.js",
-        "src/basic/BasicEventRenderer.js",
-        "src/agenda/AgendaWeekView.js",
-        "src/agenda/AgendaDayView.js",
-        "src/agenda/AgendaView.js",
-        "src/agenda/AgendaEventRenderer.js",
-        "src/common/View.js",
-        "src/common/DayEventRenderer.js",
-        "src/common/SelectionManager.js",
-        "src/common/OverlayManager.js",
-        "src/common/CoordinateGrid.js",
-        "src/common/HoverListener.js",
-        "src/common/HorizontalPositionCache.js",
-        "src/outro.js"
-      ],
-      "styles": [
-        "src/main.css",
-        "src/common/common.css",
-        "src/basic/basic.css",
-        "src/agenda/agenda.css"
-      ]
-    },
-    "fullcalendar.print": {
-      "styles": [
-        "src/common/print.css"
-      ]
-    },
-    "gcal": {
-      "scripts": [
-        "src/gcal/gcal.js"
-      ]
-    }
-  }
-}