Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial port of build process to gulp #3106

Merged
merged 22 commits into from
Oct 22, 2015
Merged

Initial port of build process to gulp #3106

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7e08a7b
Initial port of build process to gulp
mramato Oct 16, 2015
ac44060
Use r.js optimizer programatically via npm module.
mramato Oct 18, 2015
a140689
Fix Node 0.10 support
mramato Oct 18, 2015
d12c5a0
Ongoing gulp work
mramato Oct 18, 2015
aecb78a
Add build-watch gulp task
mramato Oct 18, 2015
bc1ea1e
Fix almond loader.
mramato Oct 18, 2015
845e253
Switch eclipse launch configurations to gulp.
mramato Oct 19, 2015
19add8c
Add `build` back as a `jsHint` dependancy.
mramato Oct 19, 2015
554faff
Fix stubs generation.
mramato Oct 19, 2015
4addf0d
createTaskProcessorWorker was not being properly excluded.
mramato Oct 20, 2015
26452fd
Fix issues with combined Workers
mramato Oct 20, 2015
62e50ba
Merge remote-tracking branch 'origin/master' into gulp
mramato Oct 21, 2015
221590d
Update CHANGES.md
mramato Oct 21, 2015
bb839ef
Changes after review.
mramato Oct 21, 2015
f789a73
Remove unecessary type casting.
mramato Oct 21, 2015
79b230b
Fix shader minification.
mramato Oct 21, 2015
1cfa1be
Changes after review
mramato Oct 21, 2015
a3df692
Fix typo, again.
mramato Oct 22, 2015
d855fe5
Minify shaders when running `buildApps`
mramato Oct 22, 2015
6061d19
Include Shaders subdirectories.
mramato Oct 22, 2015
fd1169c
More changes after review.
mramato Oct 22, 2015
798774f
Hopefully last review comment.
mramato Oct 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions .externalToolBuilders/automaticBuild.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="build,"/>
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="build,"/>
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,"/>
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Cesium"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Cesium/build.xml}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_path:node}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="./node_modules/gulp/bin/gulp.js build"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Cesium}"/>
</launchConfiguration>
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ Thumbs.db
/Apps/CesiumViewer/Gallery/gallery-index.js

/Apps/Sandcastle/jsHintOptions.js
/Apps/Sandcastle/.jshintrc
/Apps/Sandcastle/gallery/gallery-index.js

/Source/Cesium.js

/Source/Shaders/*.js
/Source/Shaders/*/*.js
/Source/Shaders/*/*/*.js
!/Source/Shaders/Shaders.profile.js

/Specs/SpecList.js

Expand Down
1 change: 1 addition & 0 deletions .idea/cesium.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 1 addition & 24 deletions .idea/watcherTasks.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@
"shadow": false,
"sub": false,
"supernew": false,
"browser": true
"browser": true,
"predef": [ "JSON" ]
}
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ node_js:
- "0.10"
sudo: false
script:
- ant jsHint release -DnodePath=node
- npm run jsHint && npm run release
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Change Log
* Fixed token issue in `ArcGisMapServerImageryProvider`.
* `ImageryLayerFeatureInfo` now has an `imageryLayer` property, indicating the layer that contains the feature.
* Added `BoxOutlineGeometry.fromAxisAlignedBoundingBox` and `BoxGeometry.fromAxisAlignedBoundingBox` functions.
* Switched to [gulp](http://gulpjs.com/) for all build tasks. `Java` and `ant` are no longer required to develop Cesium. [#3106](https://github.com/AnalyticalGraphicsInc/cesium/pull/3106)
* The WebGL setting of `failIfMajorPerformanceCaveat` now defaults to `false`, which is the official WebGL default. This improves compatibility with out-of-date drivers and remote desktop sessions. Cesium will run slower in these cases instead of simply failing to load.

### 1.14 - 2015-10-01
Expand Down
Loading