Permalink
Browse files

spots and ant cleanup

  • Loading branch information...
1 parent 2180293 commit ac95ff88f1fa5045eb0ae200eec255667b03e830 @mstandio committed Jan 2, 2013
Showing with 580 additions and 579 deletions.
  1. +74 −72 ant/build.xml
  2. BIN ant/lib/ant-contrib-1.0b3.jar
  3. +9 −21 ant/readme.txt
  4. +15 −11 bin/compiled_files.txt
  5. +0 −138 src/com/panozona/hotspots/videohotspot/conroller/BarController.as
  6. +1 −1 src/com/panozona/{hotspots/datahotspot → spots/dataspot}/DataHotspot.as
  7. +8 −6 src/com/panozona/{hotspots/simplehotspot/SimpleHotspot.as → spots/examplespot/ExampleSpot.as}
  8. BIN src/com/panozona/{hotspots/simplehotspot → spots/examplespot}/assets/arrow_blue.png
  9. +3 −3 src/com/panozona/{hotspots → spots}/fadingspot/FadingSpot.as
  10. +2 −2 src/com/panozona/{hotspots → spots}/fadingspot/data/FadingSpotData.as
  11. +1 −1 src/com/panozona/{hotspots → spots}/fadingspot/data/structure/Fade.as
  12. +1 −1 src/com/panozona/{hotspots → spots}/fadingspot/data/structure/Settings.as
  13. +177 −172 src/com/panozona/{hotspots/advancedhotspot/AdvancedHotspot.as → spots/growingspot/GrowingSpot.as}
  14. +4 −4 ...hotspots/advancedhotspot/data/AdvancedHotspotData.as → spots/growingspot/data/GrowingSpotData.as}
  15. +1 −1 src/com/panozona/{hotspots/advancedhotspot → spots/growingspot}/data/structure/Expand.as
  16. +1 −1 src/com/panozona/{hotspots/advancedhotspot → spots/growingspot}/data/structure/Settings.as
  17. +2 −2 src/com/panozona/{hotspots → spots}/nadirspot/NadirSpot.as
  18. +2 −2 src/com/panozona/{hotspots → spots}/nadirspot/data/NadirSpotData.as
  19. +1 −1 src/com/panozona/{hotspots → spots}/nadirspot/data/structure/Settings.as
  20. +12 −12 src/com/panozona/{hotspots/videohotspot/VideoHotspot.as → spots/videospot/VideoSpot.as}
  21. BIN src/com/panozona/{hotspots/videohotspot → spots/videospot}/assets/bigPlay.png
  22. BIN src/com/panozona/{hotspots/videohotspot → spots/videospot}/assets/bigReplay.png
  23. BIN src/com/panozona/{hotspots/videohotspot → spots/videospot}/assets/pause.png
  24. BIN src/com/panozona/{hotspots/videohotspot → spots/videospot}/assets/soundOff.png
  25. BIN src/com/panozona/{hotspots/videohotspot → spots/videospot}/assets/soundOn.png
  26. BIN src/com/panozona/{hotspots/videohotspot → spots/videospot}/assets/stop.png
  27. +138 −0 src/com/panozona/spots/videospot/conroller/BarController.as
  28. +17 −17 src/com/panozona/{hotspots/videohotspot → spots/videospot}/conroller/PlayerController.as
  29. +23 −23 src/com/panozona/{hotspots/videohotspot → spots/videospot}/conroller/SoundController.as
  30. +23 −23 src/com/panozona/{hotspots/videohotspot → spots/videospot}/conroller/StreamController.as
  31. +1 −1 src/com/panozona/{hotspots/videohotspot → spots/videospot}/events/BarEvent.as
  32. +1 −1 src/com/panozona/{hotspots/videohotspot → spots/videospot}/events/PlayerEvent.as
  33. +1 −1 src/com/panozona/{hotspots/videohotspot → spots/videospot}/events/SoundEvent.as
  34. +1 −1 src/com/panozona/{hotspots/videohotspot → spots/videospot}/events/StreamEvent.as
  35. +2 −2 src/com/panozona/{hotspots/videohotspot → spots/videospot}/model/BarData.as
  36. +2 −2 src/com/panozona/{hotspots/videohotspot → spots/videospot}/model/PlayerData.as
  37. +1 −1 src/com/panozona/{hotspots/videohotspot → spots/videospot}/model/Settings.as
  38. +2 −2 src/com/panozona/{hotspots/videohotspot → spots/videospot}/model/SoundData.as
  39. +2 −2 src/com/panozona/{hotspots/videohotspot → spots/videospot}/model/StreamData.as
  40. +3 −3 ...nozona/{hotspots/videohotspot/model/VideoHotspotData.as → spots/videospot/model/VideoSpotData.as}
  41. +13 −13 src/com/panozona/{hotspots/videohotspot → spots/videospot}/view/BarView.as
  42. +24 −24 src/com/panozona/{hotspots/videohotspot → spots/videospot}/view/PlayerView.as
  43. +11 −11 src/com/panozona/{hotspots/videohotspot → spots/videospot}/view/SoundView.as
  44. +1 −1 src/com/panozona/{viewer → util}/ExamplesLoader.as
View
@@ -17,18 +17,50 @@
http://ant-contrib.sourceforge.net/
http://ant-contrib.sourceforge.net/tasks/tasks/
-->
-<project name="SaladoPlayer" basedir="../.">
+<project name="SaladoPlayer" default="BuildAll" basedir="../.">
<property name="debuggableSwf" value="false"/>
+ <property file="bin/compiled_files.txt"/>
<property environment="env"/>
<property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
-
- <property file="bin/compiled_files.txt"/>
<taskdef name="mxmlc" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" classname="flex.ant.MxmlcTask"/>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+ <classpath>
+ <pathelement location="${basedir}/ant/lib/ant-contrib-1.0b3.jar"/>
+ </classpath>
+ </taskdef>
- <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-
+ <target name="BuildAll"
+ depends="SaladoPlayer,
+ ActionLogic,
+ BackgroundMusic,
+ ButtonBar,
+ Compass,
+ DropDown,
+ ExampleModule,
+ FullScreener,
+ ImageButton,
+ ImageGallery,
+ ImageMap,
+ InfoBox,
+ InfoBubble,
+ JSGateway,
+ JSGoogleMap,
+ LensFlare,
+ MenuScroller,
+ LinkOpener,
+ MouseCursor,
+ PanoLink,
+ ViewFinder,
+ ZoomSlider,
+ ExampleSpot,
+ FadingSpot,
+ GrowingSpot,
+ NadirSpot,
+ VideoSpot,
+ ExamplesLoader"/>
+
<target name="SaladoPlayer">
<propertyregex property="SaladoPlayer.swf.dir"
input="${SaladoPlayer.swf}"
@@ -626,22 +658,22 @@
</mxmlc>
</target>
- <target name="AdvancedHotspot">
- <propertyregex property="AdvancedHotspot.swf.dir"
- input="${AdvancedHotspot.swf}"
+ <target name="ExampleSpot">
+ <propertyregex property="ExampleSpot.swf.dir"
+ input="${ExampleSpot.swf}"
regexp="([a-zA-Z/]+)(?=/)"
select="\1"/>
- <propertyregex property="AdvancedHotspot.name"
- input="${AdvancedHotspot.swf}"
+ <propertyregex property="ExampleSpot.name"
+ input="${ExampleSpot.swf}"
regexp="([\w]+)(?=-.*\.swf)"
select="\1"/>
<delete>
- <fileset dir="${AdvancedHotspot.swf.dir}"
- includes="${AdvancedHotspot.name}*.swf"/>
+ <fileset dir="${ExampleSpot.swf.dir}"
+ includes="${ExampleSpot.name}*.swf"/>
</delete>
<mxmlc
- file="${basedir}/${AdvancedHotspot.as}"
- output="${basedir}/${AdvancedHotspot.swf}"
+ file="${basedir}/${ExampleSpot.as}"
+ output="${basedir}/${ExampleSpot.swf}"
fork="true" maxmemory="512m"
debug="${debuggableSwf}"
static-link-runtime-shared-libraries="true">
@@ -679,23 +711,23 @@
</compiler.include-libraries>
</mxmlc>
</target>
-
- <target name="NadirSpot">
- <propertyregex property="NadirSpot.swf.dir"
- input="${NadirSpot.swf}"
+
+ <target name="GrowingSpot">
+ <propertyregex property="GrowingSpot.swf.dir"
+ input="${GrowingSpot.swf}"
regexp="([a-zA-Z/]+)(?=/)"
select="\1"/>
- <propertyregex property="NadirSpot.name"
- input="${NadirSpot.swf}"
+ <propertyregex property="GrowingSpot.name"
+ input="${GrowingSpot.swf}"
regexp="([\w]+)(?=-.*\.swf)"
select="\1"/>
<delete>
- <fileset dir="${NadirSpot.swf.dir}"
- includes="${NadirSpot.name}*.swf"/>
+ <fileset dir="${GrowingSpot.swf.dir}"
+ includes="${GrowingSpot.name}*.swf"/>
</delete>
<mxmlc
- file="${basedir}/${NadirSpot.as}"
- output="${basedir}/${NadirSpot.swf}"
+ file="${basedir}/${GrowingSpot.as}"
+ output="${basedir}/${GrowingSpot.swf}"
fork="true" maxmemory="512m"
debug="${debuggableSwf}"
static-link-runtime-shared-libraries="true">
@@ -707,22 +739,22 @@
</mxmlc>
</target>
- <target name="SimpleHotspot">
- <propertyregex property="SimpleHotspot.swf.dir"
- input="${SimpleHotspot.swf}"
+ <target name="NadirSpot">
+ <propertyregex property="NadirSpot.swf.dir"
+ input="${NadirSpot.swf}"
regexp="([a-zA-Z/]+)(?=/)"
select="\1"/>
- <propertyregex property="SimpleHotspot.name"
- input="${SimpleHotspot.swf}"
+ <propertyregex property="NadirSpot.name"
+ input="${NadirSpot.swf}"
regexp="([\w]+)(?=-.*\.swf)"
select="\1"/>
<delete>
- <fileset dir="${SimpleHotspot.swf.dir}"
- includes="${SimpleHotspot.name}*.swf"/>
+ <fileset dir="${NadirSpot.swf.dir}"
+ includes="${NadirSpot.name}*.swf"/>
</delete>
<mxmlc
- file="${basedir}/${SimpleHotspot.as}"
- output="${basedir}/${SimpleHotspot.swf}"
+ file="${basedir}/${NadirSpot.as}"
+ output="${basedir}/${NadirSpot.swf}"
fork="true" maxmemory="512m"
debug="${debuggableSwf}"
static-link-runtime-shared-libraries="true">
@@ -734,22 +766,22 @@
</mxmlc>
</target>
- <target name="VideoHotspot">
- <propertyregex property="VideoHotspot.swf.dir"
- input="${VideoHotspot.swf}"
+ <target name="VideoSpot">
+ <propertyregex property="VideoSpot.swf.dir"
+ input="${VideoSpot.swf}"
regexp="([a-zA-Z/]+)(?=/)"
select="\1"/>
- <propertyregex property="VideoHotspot.name"
- input="${VideoHotspot.swf}"
+ <propertyregex property="VideoSpot.name"
+ input="${VideoSpot.swf}"
regexp="([\w]+)(?=-.*\.swf)"
select="\1"/>
<delete>
- <fileset dir="${VideoHotspot.swf.dir}"
- includes="${VideoHotspot.name}*.swf"/>
+ <fileset dir="${VideoSpot.swf.dir}"
+ includes="${VideoSpot.name}*.swf"/>
</delete>
<mxmlc
- file="${basedir}/${VideoHotspot.as}"
- output="${basedir}/${VideoHotspot.swf}"
+ file="${basedir}/${VideoSpot.as}"
+ output="${basedir}/${VideoSpot.swf}"
fork="true" maxmemory="512m"
debug="${debuggableSwf}"
static-link-runtime-shared-libraries="true">
@@ -783,34 +815,4 @@
</mxmlc>
</target>
- <target name="Build all"
- depends="SaladoPlayer,
- ActionLogic,
- BackgroundMusic,
- ButtonBar,
- Compass,
- DropDown,
- ExampleModule,
- FullScreener,
- ImageButton,
- ImageGallery,
- ImageMap,
- InfoBox,
- InfoBubble,
- JSGateway,
- JSGoogleMap,
- LensFlare,
- MenuScroller,
- LinkOpener,
- MouseCursor,
- PanoLink,
- ViewFinder,
- ZoomSlider,
- AdvancedHotspot,
- FadingSpot,
- NadirSpot,
- SimpleHotspot,
- VideoHotspot,
- ExamplesLoader"/>
-
</project>
Binary file not shown.
View
@@ -1,29 +1,18 @@
-
-how to install ANT:
-
- download http://ant.apache.org/bindownload.cgi
-
- unpack into directory that does not contain spaces (!)
+how run build file:
+ download FLEX from http://www.adobe.com/devnet/flex/flex-sdk-download.html
set environment variable FLEX_HOME to flex installation directory
+ download ANT from http://ant.apache.org/bindownload.cgi
+ unpack ant into directory that does not contain spaces (!)
set environment variable ANT_HOME to ANT installation directory
-
- add %ANT_HOME%\bin to your PATH
+ add %ANT_HOME%\bin to your PATH variable
for instance:
ANT_HOME E:\ant\apache-ant-1.8.3
FLEX_HOME E:\FlashDevelop\Tools\flexsdk
Path (...)C:\Java\jdk1.6.0_27\bin;%ANT_HOME%\bin
-
- see if it works by typing in command line: C:\>ant
-
- copy flexTasks.jar from FLEX_HOME\ant to ANT_HOME\lib
-
- download http://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip/download
-
- copy ant-contrib-1.0b3.jar to ANT_HOME\lib
-
+
use ANT via command line:
C:\>ant -buildfile "F:\SaladoPlayer\ant\build.xml" "SaladoPlayer"
@@ -33,8 +22,7 @@ when using FlashDevelop:
download plugin http://code.google.com/p/fd-ant-plugin/downloads/list
place unpacked *.dll in Flashdevelop plugins directory
- in Program Settings configure AntPlugin and set ANT installation directory
- restart Flashdevelop
- open "Ant window" and point to build.xml file
+ in "Program Settings" configure AntPlugin by pointing to ANT installation directory
+ restart Flashdevelop, open "Ant window" and point to build.xml file
-For more details see comments in build.xml file
+for more details see comments inside build.xml file
View
@@ -2,6 +2,8 @@
SaladoPlayer.as = src/com/panozona/player/SaladoPlayer.as
SaladoPlayer.swf = bin/viewer/SaladoPlayer-1.3.5.swf
+# modules
+
ActionLogic.as = src/com/panozona/modules/actionlogic/ActionLogic.as
ActionLogic.swf = bin/modules/ActionLogic-1.1.swf
@@ -65,22 +67,24 @@ ViewFinder.swf = bin/modules/ViewFinder-1.3.swf
ZoomSlider.as = src/com/panozona/modules/zoomslider/ZoomSlider.as
ZoomSlider.swf = bin/modules/zoomslider/ZoomSlider-1.2.swf
-AdvancedHotspot.as = src/com/panozona/hotspots/advancedhotspot/AdvancedHotspot.as
-AdvancedHotspot.swf = bin/hotspots/AdvancedHotspot-1.0.swf
+# spots
+
+ExampleSpot.as = src/com/panozona/spots/examplespot/ExampleSpot.as
+ExampleSpot.swf = bin/spots/ExampleSpot-1.0.swf
-FadingSpot.as = src/com/panozona/hotspots/fadingspot/FadingSpot.as
-FadingSpot.swf = bin/hotspots/FadingSpot-1.0.swf
+FadingSpot.as = src/com/panozona/spots/fadingspot/FadingSpot.as
+FadingSpot.swf = bin/spots/FadingSpot-1.0.swf
-NadirSpot.as = src/com/panozona/hotspots/nadirspot/NadirSpot.as
-NadirSpot.swf = bin/hotspots/NadirSpot-1.0.swf
+GrowingSpot.as = src/com/panozona/spots/growingspot/GrowingSpot.as
+GrowingSpot.swf = bin/spots/GrowingSpot-1.0.swf
-SimpleHotspot.as = src/com/panozona/hotspots/simplehotspot/SimpleHotspot.as
-SimpleHotspot.swf = bin/hotspots/SimpleHotspot-1.0.swf
+NadirSpot.as = src/com/panozona/spots/nadirspot/NadirSpot.as
+NadirSpot.swf = bin/spots/NadirSpot-1.0.swf
-VideoHotspot.as = src/com/panozona/hotspots/videohotspot/VideoHotspot.as
-VideoHotspot.swf = bin/hotspots/VideoHotspot-1.0.swf
+VideoSpot.as = src/com/panozona/spots/videospot/VideoSpot.as
+VideoSpot.swf = bin/spots/VideoSpot-1.0.swf
# configuration viewer
-ExamplesLoader.as = src/com/panozona/viewer/ExamplesLoader.as
+ExamplesLoader.as = src/com/panozona/util/ExamplesLoader.as
ExamplesLoader.swf = bin/_showcase/examplesviewer/resources/ExamplesLoader.swf
Oops, something went wrong.

0 comments on commit ac95ff8

Please sign in to comment.