paulsapps 11 лет назад
Родитель
Сommit
0aea5a18d7
1 измененных файлов с 7 добавлено и 8 удалено
  1. 7 8
      .travis.yml

+ 7 - 8
.travis.yml

@@ -55,17 +55,16 @@ before_script:
 
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew outdated wget || brew upgrade wget; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreSDK_v1-9-0.dmg; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreDependencies_OSX_libc._20130610.zip; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/NVIDIA_Cg.tgz; fi
+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreSDK.zip; fi
 
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then unzip OgreSDK.zip >> OgreSDK_extract.log; fi
 
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then hdiutil attach OgreSDK_v1-9-0.dmg; fi
+#- if [ "$TRAVIS_OS_NAME" == "osx" ]; then hdiutil attach OgreSDK_v1-9-0.dmg; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls /Volumes; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls /Volumes/OgreSDK; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls /Volumes/OgreSDK/OgreSDK; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls /Volumes/OgreSDK/OgreSDK/CMake; fi
+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls /Users/travis/build/q-gears/q-gears/OgreSDK; fi
 
 #- if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo installer -pkg /Volumes/OgreSDK/OgreSDK/OgreSDK.pkg -target /usr/local/; fi
 #- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew outdated boost || brew upgrade boost; fi
@@ -80,7 +79,7 @@ script:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cginfo; fi
 
 # fix broken SDK
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo cp /Volumes/OgreSDK/OgreSDK/include/OGRE/Overlay/OgreTextAreaOverlayElement.h /Volumes/OgreSDK/OgreSDK/lib/macosx/Release/OgreOverlay.framework/Versions/1.9.0/Headers/OgreTextAreaOverlayElement.h; fi
+#- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo cp /Volumes/OgreSDK/OgreSDK/include/OGRE/Overlay/OgreTextAreaOverlayElement.h /Volumes/OgreSDK/OgreSDK/lib/macosx/Release/OgreOverlay.framework/Versions/1.9.0/Headers/OgreTextAreaOverlayElement.h; fi
 
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then unzip OgreDependencies_OSX_libc._20130610.zip >> extract.log; fi
 
@@ -89,8 +88,8 @@ script:
 
 
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake ..; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_HOME=/Volumes/OgreSDK/OgreSDK; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_SDK=/Volumes/OgreSDK/OgreSDK; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_HOME= /Users/travis/build/q-gears/q-gears/OgreSDK; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_SDK= /Users/travis/build/q-gears/q-gears/OgreSDK; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OIS_HOME=/Users/travis/build/q-gears/q-gears/Dependencies; fi
 
 #- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -DCMAKE_INSTALL_PREFIX=/usr /Volumes/OgreSDK/OgreSDK; fi