diff --git a/indra/newview/SecondLife.xib b/indra/newview/Alchemy.xib
similarity index 98%
rename from indra/newview/SecondLife.xib
rename to indra/newview/Alchemy.xib
index d58e6c7284457f0de2515c0e496ba24d9e8269ef..5ddfc59c057b46b137c48e9e04a453ed8da8bc58 100644
--- a/indra/newview/SecondLife.xib
+++ b/indra/newview/Alchemy.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <deployment version="1060" identifier="macosx"/>
+ <deployment version="101300" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -141,7 +141,7 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
<rect key="contentRect" x="196" y="240" width="1024" height="600"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<view key="contentView" id="829">
<rect key="frame" x="0.0" y="0.0" width="1024" height="600"/>
<autoresizingMask key="autoresizingMask"/>
@@ -152,7 +152,7 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" utility="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="272" y="176" width="938" height="42"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<view key="contentView" id="942">
<rect key="frame" x="0.0" y="0.0" width="938" height="42"/>
<autoresizingMask key="autoresizingMask"/>
@@ -162,7 +162,7 @@
<autoresizingMask key="autoresizingMask"/>
<clipView key="contentView" id="GLt-7x-2XP">
<rect key="frame" x="1" y="1" width="938" height="42"/>
- <autoresizingMask key="autoresizingMask"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" spellingCorrection="YES" smartInsertDelete="YES" id="944" customClass="LLNonInlineTextView">
<rect key="frame" x="0.0" y="0.0" width="938" height="42"/>
@@ -170,7 +170,7 @@
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
<size key="minSize" width="938" height="42"/>
- <size key="maxSize" width="939" height="10000000"/>
+ <size key="maxSize" width="940" height="10000000"/>
<color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
</textView>
</subviews>
@@ -187,6 +187,7 @@
</scrollView>
</subviews>
</view>
+ <point key="canvasLocation" x="4" y="152"/>
</window>
</objects>
</document>
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f7ee3e25829c0722bc6d82c6259c3782894148e0..439580fb4776fa161a6647cb64829c5577ee7dfa 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1481,8 +1481,8 @@ if (DARWIN)
set(viewer_RESOURCE_FILES
alchemy.icns
macview.r
- Info-SecondLife.plist
- SecondLife.xib/
+ Info-Alchemy.plist
+ Alchemy.xib/
# CMake doesn't seem to support Xcode language variants well just yet
English.lproj/InfoPlist.strings
English.lproj/language.txt
@@ -2224,32 +2224,48 @@ if (DARWIN)
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
set(MACOSX_BUNDLE_BUNDLE_VERSION "${VIEWER_SHORT_VERSION}${VIEWER_MACOSX_PHASE}${VIEWER_REVISION}")
set(MACOSX_BUNDLE_COPYRIGHT "Copyright (C) 2013-2020 Alchemy Development Group")
- set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "SecondLife.nib")
+ set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "Alchemy.nib")
set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "LLApplication")
# https://blog.kitware.com/upcoming-in-cmake-2-8-12-osx-rpath-support/
set(CMAKE_MACOSX_RPATH 1)
+ set(VIEWER_APP_BUNDLE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app")
+ set(VIEWER_APP_EXE "${VIEWER_APP_BUNDLE}/Contents/MacOS/${product}")
+ set(VIEWER_APP_DSYM "${VIEWER_APP_EXE}.dSYM")
+ set(VIEWER_APP_XCARCHIVE "${VIEWER_APP_BUNDLE}/../${product}.xcarchive.zip")
+
+ configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/Info-Alchemy.plist"
+ "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/Info-Alchemy.plist"
+ )
+
set_target_properties(
${VIEWER_BINARY_NAME}
PROPERTIES
OUTPUT_NAME "${product}"
- # From Contents/MacOS/SecondLife, look in Contents/Frameworks
+ # From Contents/MacOS/Alchemy, look in Contents/Frameworks
BUILD_WITH_INSTALL_RPATH 1
INSTALL_RPATH "@loader_path/../Frameworks"
MACOSX_BUNDLE_INFO_PLIST
- "${CMAKE_CURRENT_SOURCE_DIR}/Info-SecondLife.plist"
+ "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/Info-Alchemy.plist"
)
- set(VIEWER_APP_BUNDLE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app")
- set(VIEWER_APP_EXE "${VIEWER_APP_BUNDLE}/Contents/MacOS/${product}")
- set(VIEWER_APP_DSYM "${VIEWER_APP_EXE}.dSYM")
- set(VIEWER_APP_XCARCHIVE "${VIEWER_APP_BUNDLE}/../${product}.xcarchive.zip")
+ # Make sure we can find the 'ibtool' program. If we can NOT find it we
+ # skip generation of this project
+ find_program(IBTOOL ibtool HINTS "/usr/bin" "${OSX_DEVELOPER_ROOT}/usr/bin")
+ if (${IBTOOL} STREQUAL "IBTOOL-NOTFOUND")
+ message(SEND_ERROR "ibtool can not be found and is needed to compile the .xib files. It should have been installed with
+ the Apple developer tools. The default system paths were searched in addition to ${OSX_DEVELOPER_ROOT}/usr/bin")
+ endif()
+
+ # Compile the .xib files using the 'ibtool' program with the destination being the app package
+ add_custom_command (TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+ COMMAND ${IBTOOL} --errors --warnings --notices
+ --compile ${VIEWER_APP_BUNDLE}/Contents/Resources/Alchemy.nib
+ ${CMAKE_CURRENT_SOURCE_DIR}/Alchemy.xib
+ COMMENT "Compiling ${CMAKE_CURRENT_SOURCE_DIR}/Alchemy.xib")
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/Info-SecondLife.plist"
- "${VIEWER_APP_BUNDLE}/Contents/Info.plist"
- )
add_custom_command(
TARGET ${VIEWER_BINARY_NAME} POST_BUILD
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-Alchemy.plist
similarity index 100%
rename from indra/newview/Info-SecondLife.plist
rename to indra/newview/Info-Alchemy.plist
diff --git a/indra/newview/SecondLife.nib b/indra/newview/SecondLife.nib
deleted file mode 100644
index 857a40ecae77e2163193de5864b582c09fee383b..0000000000000000000000000000000000000000
Binary files a/indra/newview/SecondLife.nib and /dev/null differ
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 457fa0dfbe22a67ec310a2fde409a8cf9bc50d2e..605eb2b26e14fd8f1aea106fdb9b8b0b8b45dce3 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1022,7 +1022,6 @@ def construct(self):
self.path("licenses-mac.txt", dst="licenses.txt")
self.path("featuretable_mac.txt")
- self.path("SecondLife.nib")
with self.prefix(src=pkgdir,dst=""):
self.path("ca-bundle.crt")