Repository: flex-tourjs Updated Branches: refs/heads/develop 91d323a59 -> 8ba2f8b6e
Adding a main build file. Removing unnecessary resource files now that there is an example directory. Project: http://git-wip-us.apache.org/repos/asf/flex-tourjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-tourjs/commit/8ba2f8b6 Tree: http://git-wip-us.apache.org/repos/asf/flex-tourjs/tree/8ba2f8b6 Diff: http://git-wip-us.apache.org/repos/asf/flex-tourjs/diff/8ba2f8b6 Branch: refs/heads/develop Commit: 8ba2f8b6e251f9819dd6200db3e0115870abc837 Parents: 91d323a Author: Peter Ent <[email protected]> Authored: Thu Jan 26 11:44:24 2017 -0500 Committer: Peter Ent <[email protected]> Committed: Thu Jan 26 11:44:24 2017 -0500 ---------------------------------------------------------------------- TourJS/src/main/resources/content.json | 18 ++++--- .../generalComponents/alert/code/simple.mxml | 24 --------- .../generalComponents/button/code/radio.mxml | 24 --------- build.xml | 56 ++++++++++++++++++++ 4 files changed, 67 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-tourjs/blob/8ba2f8b6/TourJS/src/main/resources/content.json ---------------------------------------------------------------------- diff --git a/TourJS/src/main/resources/content.json b/TourJS/src/main/resources/content.json index ba137b0..a649b61 100644 --- a/TourJS/src/main/resources/content.json +++ b/TourJS/src/main/resources/content.json @@ -17,8 +17,12 @@ "title": "Alert", "description": "Describe the Alert control", "example": [ - {"name": "simple.mxml", - "source":"content/visualComponents/generalComponents/alert/code/simple.mxml", + {"name": "Alert.mxml", + "source":"content/visualComponents/generalComponents/alert/Alert/src/main/flex/Alert.mxml", + "module_swf":"x/y/z", + "module_js":"x/y/z"}, + {"name": "SimpleAlert.mxml", + "source":"content/visualComponents/generalComponents/alert/SimpleAlert/src/main/flex/SimpleAlert.mxml", "module_swf":"x/y/z", "module_js":"x/y/z"} ]}, @@ -27,15 +31,15 @@ "description": "Describe the Button control", "example": [ {"name": "plain.mxml", - "source":"content/visualComponents/generalComponents/alert/code/simple.mxml", + "source":"content/visualComponents/generalComponents/alert/Alert/src/main/flex/Alert.mxml", "module_swf":"x/y/z", "module_js":"x/y/z"}, {"name": "toggle.mxml", - "source":"content/visualComponents/generalComponents/button/code/toggle.mxml", + "source":"content/visualComponents/generalComponents/alert/Alert/src/main/flex/Alert.mxml", "module_swf":"x/y/z", "module_js":"x/y/z"}, {"name": "radio.mxml", - "source":"content/visualComponents/generalComponents/button/code/radio.mxml", + "source":"content/visualComponents/generalComponents/alert/Alert/src/main/flex/Alert.mxml", "module_swf":"x/y/z", "module_js":"x/y/z"} ]}, @@ -44,11 +48,11 @@ "description":"Describes something else", "example": [ {"name": "plain.mxml", - "source":"content/visualComponents/generalComponents/alert/code/simple.mxml", + "source":"content/visualComponents/generalComponents/alert/Alert/src/main/flex/Alert.mxml", "module_swf":"x/y/z", "module_js":"x/y/z"}, {"name": "toggle.mxml", - "source":"content/visualComponents/generalComponents/alert/code/simple.mxml", + "source":"content/visualComponents/generalComponents/alert/Alert/src/main/flex/Alert.mxml", "module_swf":"x/y/z", "module_js":"x/y/z"} ]} http://git-wip-us.apache.org/repos/asf/flex-tourjs/blob/8ba2f8b6/TourJS/src/main/resources/content/visualComponents/generalComponents/alert/code/simple.mxml ---------------------------------------------------------------------- diff --git a/TourJS/src/main/resources/content/visualComponents/generalComponents/alert/code/simple.mxml b/TourJS/src/main/resources/content/visualComponents/generalComponents/alert/code/simple.mxml deleted file mode 100644 index 962e820..0000000 --- a/TourJS/src/main/resources/content/visualComponents/generalComponents/alert/code/simple.mxml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You under the Apache License, Version 2.0 -(the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - ---> -<js:View xmlns:fx="http://ns.adobe.com/mxml/2009"; - xmlns:js="library://ns.apache.org/flexjs/basic" - > - <!-- code that demonstrates Alert goes here --> -</js:View> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-tourjs/blob/8ba2f8b6/TourJS/src/main/resources/content/visualComponents/generalComponents/button/code/radio.mxml ---------------------------------------------------------------------- diff --git a/TourJS/src/main/resources/content/visualComponents/generalComponents/button/code/radio.mxml b/TourJS/src/main/resources/content/visualComponents/generalComponents/button/code/radio.mxml deleted file mode 100644 index a9d7d3f..0000000 --- a/TourJS/src/main/resources/content/visualComponents/generalComponents/button/code/radio.mxml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You under the Apache License, Version 2.0 -(the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - ---> -<js:View xmlns:fx="http://ns.adobe.com/mxml/2009"; - xmlns:js="library://ns.apache.org/flexjs/basic" - > - <!-- code that demonstrates Radio Button goes here --> -</js:View> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-tourjs/blob/8ba2f8b6/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..ec3fcb9 --- /dev/null +++ b/build.xml @@ -0,0 +1,56 @@ +<?xml version="1.0"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project name="TourJS" default="main" basedir="."> + + <target name="build-examples"> + <ant antfile="build.xml" target="main" dir="examples" /> + </target> + + <target name="build-tourjs"> + <ant antfile="build.xml" target="main" dir="TourJS" /> + </target> + + <target name="copyfiles"> + <copy todir="TourJS/bin-debug/resources/content"> + <fileset dir="examples"> + <include name="**/src/main/flex/**" /> + <include name="**/bin/js-release/**" /> + <include name="**/bin-debug/**" /> + </fileset> + </copy> + <copy todir="TourJS/bin/js-release/resources/content"> + <fileset dir="examples"> + <include name="**/src/main/flex/**" /> + <include name="**/bin/js-release/**" /> + <include name="**/bin-debug/**" /> + </fileset> + </copy> + </target> + + <target name="clean"> + <ant antfile="build.xml" target="clean" dir="examples"/> + <ant antfile="build.xml" target="clean" dir="TourJS" /> + </target> + + <target name="main" depends="build-examples,build-tourjs,copyfiles"> + <echo message="build complete" /> + </target> + +</project> \ No newline at end of file
