Skip to content

Commit

Permalink
Attempt at a mac travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
@nico-abram
nico-abram committed Mar 30, 2018
1 parent 8c99ae5 commit e47c377
Show file tree
Hide file tree
Showing 20 changed files with 3,822 additions and 3,849 deletions.
20 changes: 17 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ sudo: required

matrix:
include:
- env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=OFF
WITH_FFMPEG_JOBS=1
os: osx
- env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=OFF
WITH_FFMPEG_JOBS=1
compiler: clang
Expand Down Expand Up @@ -66,13 +69,24 @@ matrix:

before_script:
- if [ "${CXX_COMPILER}" = "g++-5" ]; then export CXX="g++-5" CC="gcc-5"; fi
- sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include
- if [ "$TRAVIS_OS_NAME" != "osx" ]; then sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include; fi
- git submodule update --init
- mkdir ${TRAVIS_BUILD_DIR}/build && cd ${TRAVIS_BUILD_DIR}/build
- cmake .. -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${CC_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_FFMPEG=${WITH_FFMPEG} -DWITH_FFMPEG_JOBS=${WITH_FFMPEG_JOBS}
- if [ "$TRAVIS_OS_NAME" != "osx" ]; then cmake .. -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${CC_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_FFMPEG=${WITH_FFMPEG} -DWITH_FFMPEG_JOBS=${WITH_FFMPEG_JOBS}; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl;
export LIBRARY_SEARCH_PATHS=${TRAVIS_BUILD_DIR}/Xcode/Libraries;
export LIBRARY_PATH=${TRAVIS_BUILD_DIR}/Xcode/Libraries;
brew install --HEAD libuv --universal;
brew install yasm;
brew install nasm;
brew install --HEAD zlib --universal;
mv ../src/archutils/Darwin/Etterna.pch ../src/archutils/Darwin/StepMania.pch;
cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G "Xcode" ..;
mv ../src/archutils/Darwin/StepMania.pch ../src/archutils/Darwin/Etterna.pch; fi

script:
- if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j 4; fi
- if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j 4; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then xcodebuild -project StepMania.xcodeproj -target Etterna -destination 'platform=OS X,arch=i386' -xcconfig ../Xcode/conf.cnf; fi

env:
global:
Expand Down
172 changes: 86 additions & 86 deletions Xcode/Hardware.in.plist
View file
Original file line number Diff line number Diff line change
@@ -1,86 +1,86 @@
/* http://www.cocoadev.com/index.pl?MacintoshModels */
{
"ADP2,1" = "Developer Transition Kit";
"iMac,1" = iMac;
"iMac4,1" = "iMac (Core Duo)";
"iMac5,1" = "iMac (Core 2 Duo)";
"iMac6,1" = "iMac (24-inch Core 2 Duo)";
"iMac7,1" = "iMac (Aluminum Core 2 Duo)";
"iMac8,1" = "iMac (Aluminum Core 2 Duo)";
"M43ADP1,1" = "Development Mac Pro";
"MacBook1,1" = "MacBook (Core Duo)";
"MacBook2,1" = "MacBook (Core 2 Duo)";
"MacBook3,1" = "MacBook (Core 2 Duo)";
"MacBook4,1" = "MacBook (Early 2008)";
"MacBookAir1,1" = "MacBook Air";
"MacBookPro1,1" = "MacBook Pro (15-inch Core Duo)";
"MacBookPro1,2" = "MacBook Pro (17-inch Core Duo)";
"MacBookPro2,1" = "MacBook Pro (17-inch Core 2 Duo)";
"MacBookPro2,2" = "MacBook Pro (15-inch Core 2 Duo)";
"MacBookPro3,1" = "MacBook Pro (15-inch or 17-inch LED, Core 2 Duo)";
"MacBookPro4,1" = "MacBook Pro (15-inch or 17-inch LED, Early 2008)";
"MacBookPro5,1" = "MacBook Pro (15-inch LED Unibody, Late 2008)";
"Macmini1,1" = "Mac mini (Core Duo/Solo)";
"MacPro1,1" = "Mac Pro (Quad Xeon)";
"MacPro2,1" = "Mac Pro (Octal Xeon)";
"MacPro3,1" = "Mac Pro (Early 2008)";
"PowerBook1,1" = "PowerBook G3";
"PowerBook2,1" = iBook;
"PowerBook2,2" = "iBook (FireWire)";
"PowerBook3,1" = "PowerBook G3 (FireWire)";
"PowerBook3,2" = "PowerBook G4";
"PowerBook3,3" = "PowerBook G4 (Gigabit Ethernet)";
"PowerBook3,4" = "PowerBook G4 (DVI)";
"PowerBook3,5" = "PowerBook G4 (867, 1 GHz)";
"PowerBook4,1" = "iBook G3";
"PowerBook4,2" = "iBook G3";
"PowerBook4,3" = "iBook G3";
"PowerBook5,1" = "PowerBook G4 (17-inch)";
"PowerBook5,2" = "PowerBook G4 (15-inch FW800)";
"PowerBook5,3" = "PowerBook G4 (17-inch 1.33 GHz)";
"PowerBook5,4" = "PowerBook G4 (15-inch 1.5/1.33 GHz)";
"PowerBook5,5" = "PowerBook G4 (17-inch 1.5 GHz)";
"PowerBook5,6" = "PowerBook G4 (15-inch 1.67/1.5 GHz)";
"PowerBook5,7" = "PowerBook G4 (17-inch 1.67 GHz)";
"PowerBook5,8" = "PowerBook G4 (Double-Layer SD, 15-inch)";
"PowerBook5,9" = "PowerBook G4 (Double-Layer SD, 17-inch)";
"PowerBook6,1" = "PowerBook G4 (12-inch)";
"PowerBook6,2" = "PowerBook G4 (12-inch DVI)";
"PowerBook6,3" = "iBook G4";
"PowerBook6,4" = "PowerBook G4 (12-inch 1.33 GHz)";
"PowerBook6,5" = "iBook G4";
"PowerBook6,7" = "iBook G4";
"PowerBook6,8" = "PowerBook G4 (12-inch 1.5 GHz)";
"PowerMac1,1" = "Power Macintosh G3 (B&W)";
"PowerMac1,2" = "Power Macintosh G4 (PCI-Graphics)";
"PowerMac10,1" = "Mac mini";
"PowerMac10,2" = "Mac mini";
"PowerMac11,2" = "Power Macintosh G5 (PCIe)";
"PowerMac12,1" = "iMac G5 (iSight)";
"PowerMac2,1" = "iMac (Slot-Loading)";
"PowerMac2,2" = "iMac (2000)";
"PowerMac3,1" = "Power Macintosh G4 (AGP-Graphics)";
"PowerMac3,2" = "Power Macintosh G4 (AGP-Graphics)";
"PowerMac3,3" = "Power Macintosh G4 (Gigabit Ethernet)";
"PowerMac3,4" = "Power Macintosh G4 (Digital Audio)";
"PowerMac3,5" = "Power Macintosh G4 (Quick Silver)";
"PowerMac3,6" = "Power Macintosh G4 (Mirrored Drive Doors)";
"PowerMac4,1" = "iMac (2001)";
"PowerMac4,2" = "iMac (Flat Panel)";
"PowerMac4,4" = "eMac G3";
"PowerMac4,5" = "iMac (17-inch Flat Panel)";
"PowerMac5,1" = "Power Macintosh G4 Cube";
"PowerMac6,1" = "iMac (USB 2.0)";
"PowerMac6,3" = "iMac (20-inch Flat Panel)";
"PowerMac6,4" = "eMac (USB 2.0)";
"PowerMac7,2" = "Power Macintosh G5";
"PowerMac7,3" = "Power Macintosh G5";
"PowerMac8,1" = "iMac G5";
"PowerMac8,2" = "iMac G5 (Ambient Light Sensor)";
"PowerMac9,1" = "Power Macintosh G5 (Late 2004)";
"RackMac1,1" = "Xserve G4";
"RackMac1,2" = "Xserve G4 (Slot-Loading)";
"RackMac3,1" = "Xserve G5";
"Xserve1,1" = "Xserve Xeon";
"Xserve2,1" = "Xserve Xeon";
}
/* http://www.cocoadev.com/index.pl?MacintoshModels */
{
"ADP2,1" = "Developer Transition Kit";
"iMac,1" = iMac;
"iMac4,1" = "iMac (Core Duo)";
"iMac5,1" = "iMac (Core 2 Duo)";
"iMac6,1" = "iMac (24-inch Core 2 Duo)";
"iMac7,1" = "iMac (Aluminum Core 2 Duo)";
"iMac8,1" = "iMac (Aluminum Core 2 Duo)";
"M43ADP1,1" = "Development Mac Pro";
"MacBook1,1" = "MacBook (Core Duo)";
"MacBook2,1" = "MacBook (Core 2 Duo)";
"MacBook3,1" = "MacBook (Core 2 Duo)";
"MacBook4,1" = "MacBook (Early 2008)";
"MacBookAir1,1" = "MacBook Air";
"MacBookPro1,1" = "MacBook Pro (15-inch Core Duo)";
"MacBookPro1,2" = "MacBook Pro (17-inch Core Duo)";
"MacBookPro2,1" = "MacBook Pro (17-inch Core 2 Duo)";
"MacBookPro2,2" = "MacBook Pro (15-inch Core 2 Duo)";
"MacBookPro3,1" = "MacBook Pro (15-inch or 17-inch LED, Core 2 Duo)";
"MacBookPro4,1" = "MacBook Pro (15-inch or 17-inch LED, Early 2008)";
"MacBookPro5,1" = "MacBook Pro (15-inch LED Unibody, Late 2008)";
"Macmini1,1" = "Mac mini (Core Duo/Solo)";
"MacPro1,1" = "Mac Pro (Quad Xeon)";
"MacPro2,1" = "Mac Pro (Octal Xeon)";
"MacPro3,1" = "Mac Pro (Early 2008)";
"PowerBook1,1" = "PowerBook G3";
"PowerBook2,1" = iBook;
"PowerBook2,2" = "iBook (FireWire)";
"PowerBook3,1" = "PowerBook G3 (FireWire)";
"PowerBook3,2" = "PowerBook G4";
"PowerBook3,3" = "PowerBook G4 (Gigabit Ethernet)";
"PowerBook3,4" = "PowerBook G4 (DVI)";
"PowerBook3,5" = "PowerBook G4 (867, 1 GHz)";
"PowerBook4,1" = "iBook G3";
"PowerBook4,2" = "iBook G3";
"PowerBook4,3" = "iBook G3";
"PowerBook5,1" = "PowerBook G4 (17-inch)";
"PowerBook5,2" = "PowerBook G4 (15-inch FW800)";
"PowerBook5,3" = "PowerBook G4 (17-inch 1.33 GHz)";
"PowerBook5,4" = "PowerBook G4 (15-inch 1.5/1.33 GHz)";
"PowerBook5,5" = "PowerBook G4 (17-inch 1.5 GHz)";
"PowerBook5,6" = "PowerBook G4 (15-inch 1.67/1.5 GHz)";
"PowerBook5,7" = "PowerBook G4 (17-inch 1.67 GHz)";
"PowerBook5,8" = "PowerBook G4 (Double-Layer SD, 15-inch)";
"PowerBook5,9" = "PowerBook G4 (Double-Layer SD, 17-inch)";
"PowerBook6,1" = "PowerBook G4 (12-inch)";
"PowerBook6,2" = "PowerBook G4 (12-inch DVI)";
"PowerBook6,3" = "iBook G4";
"PowerBook6,4" = "PowerBook G4 (12-inch 1.33 GHz)";
"PowerBook6,5" = "iBook G4";
"PowerBook6,7" = "iBook G4";
"PowerBook6,8" = "PowerBook G4 (12-inch 1.5 GHz)";
"PowerMac1,1" = "Power Macintosh G3 (B&W)";
"PowerMac1,2" = "Power Macintosh G4 (PCI-Graphics)";
"PowerMac10,1" = "Mac mini";
"PowerMac10,2" = "Mac mini";
"PowerMac11,2" = "Power Macintosh G5 (PCIe)";
"PowerMac12,1" = "iMac G5 (iSight)";
"PowerMac2,1" = "iMac (Slot-Loading)";
"PowerMac2,2" = "iMac (2000)";
"PowerMac3,1" = "Power Macintosh G4 (AGP-Graphics)";
"PowerMac3,2" = "Power Macintosh G4 (AGP-Graphics)";
"PowerMac3,3" = "Power Macintosh G4 (Gigabit Ethernet)";
"PowerMac3,4" = "Power Macintosh G4 (Digital Audio)";
"PowerMac3,5" = "Power Macintosh G4 (Quick Silver)";
"PowerMac3,6" = "Power Macintosh G4 (Mirrored Drive Doors)";
"PowerMac4,1" = "iMac (2001)";
"PowerMac4,2" = "iMac (Flat Panel)";
"PowerMac4,4" = "eMac G3";
"PowerMac4,5" = "iMac (17-inch Flat Panel)";
"PowerMac5,1" = "Power Macintosh G4 Cube";
"PowerMac6,1" = "iMac (USB 2.0)";
"PowerMac6,3" = "iMac (20-inch Flat Panel)";
"PowerMac6,4" = "eMac (USB 2.0)";
"PowerMac7,2" = "Power Macintosh G5";
"PowerMac7,3" = "Power Macintosh G5";
"PowerMac8,1" = "iMac G5";
"PowerMac8,2" = "iMac G5 (Ambient Light Sensor)";
"PowerMac9,1" = "Power Macintosh G5 (Late 2004)";
"RackMac1,1" = "Xserve G4";
"RackMac1,2" = "Xserve G4 (Slot-Loading)";
"RackMac3,1" = "Xserve G5";
"Xserve1,1" = "Xserve Xeon";
"Xserve2,1" = "Xserve Xeon";
}
48 changes: 24 additions & 24 deletions Xcode/Libraries/Info.plist
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>Libraries</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.apple.carbonframeworktemplate</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleSignature</key>
<string>OGG_</string>
<key>CFBundleVersion</key>
<string>1.11</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
</plist>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>Libraries</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.apple.carbonframeworktemplate</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleSignature</key>
<string>OGG_</string>
<key>CFBundleVersion</key>
<string>1.11</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
</plist>
Loading

0 comments on commit e47c377

Please sign in to comment.