mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 21:31:04 +00:00
more Mac OS X 10.4 "Tiger" build stuff. Patch my Mark Mentovai. b=292530 r=josh r=pinkerton r=cls sr=bryner a=brendan
This commit is contained in:
joshmoz%gmail.com
parent
fad47e58db
commit
f299a66dc7
@ -97,6 +97,7 @@ USE_ELF_DYNSTR_GC = @USE_ELF_DYNSTR_GC@
|
||||
USE_PREBINDING = @USE_PREBINDING@
|
||||
INCREMENTAL_LINKER = @INCREMENTAL_LINKER@
|
||||
MACOS_DEPLOYMENT_TARGET = @MACOS_DEPLOYMENT_TARGET@
|
||||
MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
|
||||
MOZ_MAIL_NEWS = @MOZ_MAIL_NEWS@
|
||||
MOZ_CALENDAR = @MOZ_CALENDAR@
|
||||
MOZ_PLAINTEXT_EDITOR_ONLY = @MOZ_PLAINTEXT_EDITOR_ONLY@
|
||||
@ -328,6 +329,7 @@ STRIP = @STRIP@
|
||||
DOXYGEN = @DOXYGEN@
|
||||
MAKE = @MAKE@
|
||||
PBBUILD_BIN = @PBBUILD@
|
||||
SDP = @SDP@
|
||||
|
||||
ifdef MOZ_NATIVE_JPEG
|
||||
JPEG_CFLAGS = @JPEG_CFLAGS@
|
||||
@ -522,6 +524,7 @@ MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
|
||||
MINIMO = @MINIMO@
|
||||
|
||||
MACOS_SDK_DIR = @MACOS_SDK_DIR@
|
||||
GCC_VERSION = @GCC_VERSION@
|
||||
|
||||
VISIBILITY_FLAGS = @VISIBILITY_FLAGS@
|
||||
WRAP_SYSTEM_INCLUDES = @WRAP_SYSTEM_INCLUDES@
|
||||
|
||||
@ -719,12 +719,24 @@ ifeq ($(OS_ARCH),Darwin)
|
||||
ifdef USE_PREBINDING
|
||||
export LD_PREBIND=1
|
||||
export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
|
||||
endif
|
||||
endif # USE_PREBINDING
|
||||
PBBUILD = NEXT_ROOT= $(PBBUILD_BIN)
|
||||
PBBUILD_SETTINGS = GCC_VERSION="$(GCC_VERSION)"
|
||||
ifdef MACOS_SDK_DIR
|
||||
export NEXT_ROOT=$(MACOS_SDK_DIR)
|
||||
endif
|
||||
PBBUILD=NEXT_ROOT= $(PBBUILD_BIN)
|
||||
endif
|
||||
PBBUILD_SETTINGS += SDKROOT="$(MACOS_SDK_DIR)"
|
||||
endif # MACOS_SDK_DIR
|
||||
ifdef MACOSX_DEPLOYMENT_TARGET
|
||||
export MACOSX_DEPLOYMENT_TARGET
|
||||
PBBUILD_SETTINGS += MACOSX_DEPLOYMENT_TARGET="$(MACOSX_DEPLOYMENT_TARGET)"
|
||||
endif # MACOSX_DEPLOYMENT_TARGET
|
||||
ifdef MOZ_OPTIMIZE
|
||||
ifeq (2,$(MOZ_OPTIMIZE))
|
||||
# Only override project defaults if the config specified explicit settings
|
||||
PBBUILD_SETTINGS += GCC_MODEL_TUNING= OPTIMIZATION_CFLAGS="$(MOZ_OPTIMIZE_FLAGS)"
|
||||
endif # MOZ_OPTIMIZE=2
|
||||
endif # MOZ_OPTIMIZE
|
||||
endif # OS_ARCH=Darwin
|
||||
|
||||
|
||||
ifeq (,$(filter-out WINCE,$(OS_ARCH)))
|
||||
|
||||
223
configure.in
223
configure.in
@ -32,6 +32,8 @@ dnl xpctools support
|
||||
dnl Benjamin Smedberg <bsmedberg@covad.net>
|
||||
dnl Howard Chu <hyc@symas.com>
|
||||
dnl MSYS support
|
||||
dnl Mark Mentovai <mark@moxienet.com>:
|
||||
dnl Mac OS X 10.4 support
|
||||
dnl
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl ========================================================
|
||||
@ -438,39 +440,6 @@ AC_SUBST(GNU_LD)
|
||||
AC_SUBST(GNU_CC)
|
||||
AC_SUBST(GNU_CXX)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Mac OS X SDK support
|
||||
dnl ========================================================
|
||||
MACOS_SDK_DIR=
|
||||
MOZ_ARG_WITH_STRING(macos-sdk,
|
||||
[ --with-macos-sdk=dir Location of platform SDK to use (Mac OS X only)],
|
||||
MACOS_SDK_DIR=$withval)
|
||||
|
||||
AC_SUBST(MACOS_SDK_DIR)
|
||||
|
||||
if test "$MACOS_SDK_DIR"; then
|
||||
export NEXT_ROOT=$MACOS_SDK_DIR
|
||||
changequote(,)
|
||||
GCC_VERSION=`echo $CXX_VERSION | perl -pe "s/^.*gcc version ([^ ]*).*/\1/"`
|
||||
changequote([,])
|
||||
CFLAGS="-I${MACOS_SDK_DIR}/usr/include/gcc/darwin/${GCC_VERSION} -I${MACOS_SDK_DIR}/usr/include $CFLAGS"
|
||||
CXXFLAGS="-I${MACOS_SDK_DIR}/usr/include/gcc/darwin/${GCC_VERSION} -I${MACOS_SDK_DIR}/usr/include $CXXFLAGS"
|
||||
LIBS="-L${MACOS_SDK_DIR}/usr/lib/gcc/darwin/${GCC_VERSION} -L${MACOS_SDK_DIR}/usr/lib $LIBS"
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl Java SDK support
|
||||
dnl ========================================================
|
||||
JAVA_INCLUDE_PATH=
|
||||
MOZ_ARG_WITH_STRING(java-include-path,
|
||||
[ --with-java-include-path=dir Location of Java SDK headers],
|
||||
JAVA_INCLUDE_PATH=$withval)
|
||||
|
||||
JAVA_BIN_PATH=
|
||||
MOZ_ARG_WITH_STRING(java-bin-path,
|
||||
[ --with-java-bin-path=dir Location of Java binaries (java, javac, jar)],
|
||||
JAVA_BIN_PATH=$withval)
|
||||
|
||||
dnl ========================================================
|
||||
dnl Checks for programs.
|
||||
dnl ========================================================
|
||||
@ -515,12 +484,101 @@ AC_PATH_PROG(XARGS, xargs)
|
||||
if test -z "$XARGS" || test "$XARGS" = ":"; then
|
||||
AC_MSG_ERROR([xargs not found in \$PATH .])
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Mac OS X toolchain support
|
||||
dnl ========================================================
|
||||
case "$target_os" in
|
||||
darwin*)
|
||||
dnl Current known valid versions for GCC_VERSION are 2.95.2 3.1 3.3 4.0.
|
||||
dnl 4.0 identifies itself as 4.0.x, so strip the decidecimal for
|
||||
dnl the environment and includedir purposes (when using an SDK, below),
|
||||
dnl but remember the full version number for the libdir (SDK).
|
||||
changequote(,)
|
||||
GCC_VERSION_FULL=`echo $CXX_VERSION | $PERL -pe 's/^.*gcc version ([^ ]*).*/$1/'`
|
||||
GCC_VERSION=`echo $GCC_VERSION_FULL | $PERL -pe '(split(/\./))[0]>=4&&s/(^\d*\.\d*).*/$1/;'`
|
||||
changequote([,])
|
||||
if test "$GCC_VERSION_FULL" = "4.0.0" ; then
|
||||
dnl Bug 280479, but this keeps popping up in bug 292530 too because
|
||||
dnl 4.0.0/4061 is the default compiler in Tiger.
|
||||
changequote(,)
|
||||
GCC_BUILD=`echo $CXX_VERSION | $PERL -pe 's/^.*build ([^ )]*).*/$1/'`
|
||||
changequote([,])
|
||||
if test "$GCC_BUILD" = "4061" ; then
|
||||
AC_MSG_WARN([You are attempting to use gcc 4.0.0 build 4061.
|
||||
This compiler is unable to build Mozilla. gcc 3.3 is recommended.
|
||||
Run \"sudo gcc_select 3.3\" to switch the system's default compiler.])
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl xcodebuild needs GCC_VERSION defined in the environment, since it
|
||||
dnl doesn't respect the CC/CXX setting. With GCC_VERSION set, it will use
|
||||
dnl /usr/bin/g(cc|++)-$GCC_VERSION.
|
||||
AC_PATH_PROGS(PBBUILD, pbbuild xcodebuild pbxbuild)
|
||||
|
||||
dnl sdp was formerly in /Developer/Tools. As of Mac OS X 10.4 (Darwin 8),
|
||||
dnl it has moved into /usr/bin.
|
||||
AC_PATH_PROG(SDP, sdp, :, [$PATH:/usr/bin:/Developer/Tools])
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(GCC_VERSION)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Mac OS X SDK support
|
||||
dnl ========================================================
|
||||
MACOS_SDK_DIR=
|
||||
MOZ_ARG_WITH_STRING(macos-sdk,
|
||||
[ --with-macos-sdk=dir Location of platform SDK to use (Mac OS X only)],
|
||||
MACOS_SDK_DIR=$withval)
|
||||
|
||||
AC_SUBST(MACOS_SDK_DIR)
|
||||
|
||||
if test "$MACOS_SDK_DIR"; then
|
||||
if test ! -d "$MACOS_SDK_DIR"; then
|
||||
AC_MSG_ERROR([SDK not found. When using --with-macos-sdk, you must
|
||||
specify a valid SDK. SDKs are installed when the optional cross-development
|
||||
tools are selected during the Xcode/Developer Tools installation.])
|
||||
fi
|
||||
|
||||
export NEXT_ROOT=$MACOS_SDK_DIR
|
||||
|
||||
dnl Sync this block with the NEXT_ROOT block in nsprpub/configure.in
|
||||
dnl
|
||||
dnl Changes to the cross environment here need to be accounted for in
|
||||
dnl the libIDL checks (below) and xpidl build.
|
||||
|
||||
GCC_VERSION_MAJOR=`echo $GCC_VERSION_FULL | $PERL -pe 's/(^\d*).*/$1/;'`
|
||||
if test "$GCC_VERSION_MAJOR" -lt "4" ; then
|
||||
TARGET_ARCH_LIB="darwin"
|
||||
TARGET_ARCH_INCLUDE="ppc-darwin"
|
||||
SDK_C_INCLUDE="-isystem ${MACOS_SDK_DIR}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOS_SDK_DIR}/usr/include -F${MACOS_SDK_DIR}/System/Library/Frameworks"
|
||||
else
|
||||
dnl If gcc >= 4, use powerpc-apple-darwin#, where # is the version of
|
||||
dnl the Darwin release corresponding to the target Mac OS X release.
|
||||
dnl For OS X >= 10.1.1, take the minor version number and add 4 to get
|
||||
dnl the Darwin major version number. If it can't be determined, use the
|
||||
dnl current Darwin major version number and hope that there's a symlink.
|
||||
TARGET_ARCH_LIB=powerpc-apple-darwin`echo $MACOS_SDK_DIR | $PERL -pe 's/MacOSX10\.([^\.]*)//;if ($1) {$_=$1+4;} else {$_="'${target_os}'";s/(\d+)//;$_=$1;}'`
|
||||
TARGET_ARCH_INCLUDE=$TARGET_ARCH_LIB
|
||||
SDK_C_INCLUDE="-isystem ${MACOS_SDK_DIR}/usr/lib/gcc/${TARGET_ARCH_LIB}/${GCC_VERSION_FULL}/include -isystem ${MACOS_SDK_DIR}/usr/include -F${MACOS_SDK_DIR}/System/Library/Frameworks"
|
||||
fi
|
||||
|
||||
if test -d "${MACOS_SDK_DIR}/Library/Frameworks" ; then
|
||||
SDK_C_INCLUDE="$SDK_C_INCLUDE -F${MACOS_SDK_DIR}/Library/Frameworks"
|
||||
fi
|
||||
|
||||
SDK_CXX_INCLUDE="-I${MACOS_SDK_DIR}/usr/include/gcc/darwin/${GCC_VERSION}/c++ -I${MACOS_SDK_DIR}/usr/include/gcc/darwin/${GCC_VERSION}/c++/${TARGET_ARCH_INCLUDE} -I${MACOS_SDK_DIR}/usr/include/gcc/darwin/${GCC_VERSION}/c++/backward"
|
||||
CFLAGS="$CFLAGS -nostdinc ${SDK_C_INCLUDE}"
|
||||
CXXFLAGS="$CXXFLAGS -nostdinc -nostdinc++ ${SDK_CXX_INCLUDE} ${SDK_C_INCLUDE}"
|
||||
|
||||
dnl CPP/CXXCPP needs to be set for AC_CHECK_HEADER.
|
||||
CPP="$CPP -nostdinc ${SDK_C_INCLUDE}"
|
||||
CXXCPP="$CXXCPP -nostdinc -nostdinc++ ${SDK_CXX_INCLUDE} ${SDK_C_INCLUDE}"
|
||||
|
||||
LIBS="-L${MACOS_SDK_DIR}/usr/lib/gcc/${TARGET_ARCH_LIB} -L${MACOS_SDK_DIR}/usr/lib/gcc/${TARGET_ARCH_LIB}/${GCC_VERSION_FULL} -L${MACOS_SDK_DIR}/usr/lib $LIBS"
|
||||
fi
|
||||
|
||||
dnl Be sure the make we use is GNU make.
|
||||
dnl on win32, gmake.exe is the generally the wrong version
|
||||
case "$host_os" in
|
||||
@ -2384,7 +2442,7 @@ dnl ========================================================
|
||||
MOZ_ARG_ENABLE_STRING(macos-target,
|
||||
[ --enable-macos-target=VER (default=10.1)
|
||||
Set the minimum MacOS version needed at runtime],
|
||||
[MACOS_DEPLOYMENT_TARGET_STR=$enableval],
|
||||
[MACOS_DEPLOYMENT_TARGET_STR=$enableval _MACOS_DT_SET=1],
|
||||
[MACOS_DEPLOYMENT_TARGET_STR=10.1])
|
||||
|
||||
case "$target" in
|
||||
@ -2405,6 +2463,11 @@ case "$target" in
|
||||
|
||||
MACOS_DEPLOYMENT_TARGET=`printf "%02d%02d%02d" "$MACOS_VERSION_MAJOR" "$MACOS_VERSION_MINOR" "$MACOS_VERSION_MICRO"`
|
||||
AC_DEFINE_UNQUOTED(MACOS_DEPLOYMENT_TARGET, $MACOS_DEPLOYMENT_TARGET)
|
||||
|
||||
if test -n "$_MACOS_DT_SET" ; then
|
||||
dnl ld uses this.
|
||||
export MACOSX_DEPLOYMENT_TARGET="$MACOS_VERSION_MAJOR.$MACOS_VERSION_MINOR"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
MACOS_DEPLOYMENT_TARGET=
|
||||
@ -2412,6 +2475,7 @@ case "$target" in
|
||||
esac
|
||||
|
||||
AC_SUBST(MACOS_DEPLOYMENT_TARGET)
|
||||
AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
|
||||
|
||||
dnl ========================================================
|
||||
dnl See if mmap sees writes
|
||||
@ -3298,6 +3362,19 @@ if test "$MOZ_ENABLE_CANVAS"; then
|
||||
AC_DEFINE(MOZ_ENABLE_CANVAS)
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl Java SDK support
|
||||
dnl ========================================================
|
||||
JAVA_INCLUDE_PATH=
|
||||
MOZ_ARG_WITH_STRING(java-include-path,
|
||||
[ --with-java-include-path=dir Location of Java SDK headers],
|
||||
JAVA_INCLUDE_PATH=$withval)
|
||||
|
||||
JAVA_BIN_PATH=
|
||||
MOZ_ARG_WITH_STRING(java-bin-path,
|
||||
[ --with-java-bin-path=dir Location of Java binaries (java, javac, jar)],
|
||||
JAVA_BIN_PATH=$withval)
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Toolkit Options
|
||||
@ -4371,9 +4448,6 @@ if test -n "$USE_GSSAPI" && test `echo "$MOZ_EXTENSIONS" | grep -c negotiateauth
|
||||
[ --with-gssapi=PFX Location of GSSAPI libraries],
|
||||
GSSAPI_DIR=$withval)
|
||||
|
||||
dnl
|
||||
dnl If not specified, assume GSSAPI lives under /usr
|
||||
dnl
|
||||
if test -z "$GSSAPI_DIR"; then
|
||||
dnl
|
||||
dnl RedHat Linux 7, 8, and 9 install GSSAPI headers and libraries under
|
||||
@ -4384,26 +4458,35 @@ if test -n "$USE_GSSAPI" && test `echo "$MOZ_EXTENSIONS" | grep -c negotiateauth
|
||||
dnl
|
||||
if test -d "/usr/kerberos/include"; then
|
||||
GSSAPI_DIR="/usr/kerberos"
|
||||
else
|
||||
GSSAPI_DIR="/usr"
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl
|
||||
dnl If not specified, assume GSSAPI is in the system directories
|
||||
dnl
|
||||
if test -n "$GSSAPI_DIR"; then
|
||||
_GSSAPI_INC="-I$GSSAPI_DIR/include"
|
||||
_GSSAPI_LIB="-L$GSSAPI_DIR/lib"
|
||||
else
|
||||
_GSSAPI_INC=
|
||||
_GSSAPI_LIB=
|
||||
fi
|
||||
|
||||
_SAVE_CPPFLAGS="$CPPFLAGS"
|
||||
_SAVE_LDFLAGS="$LDFLAGS"
|
||||
_SAVE_LIBS="$LIBS"
|
||||
|
||||
CPPFLAGS="$CPPFLAGS -I$GSSAPI_DIR/include"
|
||||
LDFLAGS="$LDFLAGS -L$GSSAPI_DIR/lib"
|
||||
CPPFLAGS="$CPPFLAGS $_GSSAPI_INC"
|
||||
LDFLAGS="$LDFLAGS $_GSSAPI_LIB"
|
||||
|
||||
dnl
|
||||
dnl Try to set GSSAPI_INCLUDES ...
|
||||
dnl
|
||||
AC_CHECK_HEADERS(gssapi.h,
|
||||
[GSSAPI_INCLUDES="-I$GSSAPI_DIR/include"])
|
||||
[GSSAPI_INCLUDES="$_GSSAPI_INC"])
|
||||
if test -z "$GSSAPI_INCLUDES" ; then
|
||||
AC_CHECK_HEADERS(gssapi/gssapi.h,
|
||||
[GSSAPI_INCLUDES="-I$GSSAPI_DIR/include"])
|
||||
[GSSAPI_INCLUDES="$_GSSAPI_INC"])
|
||||
fi
|
||||
CPPFLAGS="$_SAVE_CPPFLAGS $GSSAPI_INCLUDES"
|
||||
|
||||
@ -4411,7 +4494,7 @@ if test -n "$USE_GSSAPI" && test `echo "$MOZ_EXTENSIONS" | grep -c negotiateauth
|
||||
dnl Try to set GSSAPI_LIBS ...
|
||||
dnl
|
||||
AC_CHECK_LIB(gss, gss_init_sec_context,
|
||||
[GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgss"],)
|
||||
[GSSAPI_LIBS="$_GSSAPI_LIB -lgss"],)
|
||||
|
||||
dnl
|
||||
dnl If libgss was not found, look for the MIT Kerberos V5 GSSAPI
|
||||
@ -4421,7 +4504,7 @@ if test -n "$USE_GSSAPI" && test `echo "$MOZ_EXTENSIONS" | grep -c negotiateauth
|
||||
dnl
|
||||
dnl We only need to link to libgssapi_krb5.so
|
||||
dnl
|
||||
_GSS_LIBS="-L$GSSAPI_DIR/lib -lgssapi_krb5"
|
||||
_GSS_LIBS="$_GSSAPI_LIB -lgssapi_krb5"
|
||||
LIBS="$LIBS $_GSS_LIBS"
|
||||
AC_CHECK_FUNC(gss_init_sec_context,
|
||||
[GSSAPI_LIBS="$_GSS_LIBS"],)
|
||||
@ -4433,10 +4516,14 @@ if test -n "$USE_GSSAPI" && test `echo "$MOZ_EXTENSIONS" | grep -c negotiateauth
|
||||
dnl Kerberos V5 libraries.
|
||||
dnl
|
||||
if test -z "$GSSAPI_LIBS" ; then
|
||||
if test -x "$GSSAPI_DIR/bin/krb5-config" ; then
|
||||
krb5cfg="$GSSAPI_DIR/bin/krb5-config"
|
||||
TMP_GSSAPI_LIBS=`$krb5cfg --libs gssapi 2>/dev/null`
|
||||
TMP_GSSAPI_INCLUDES=`$krb5cfg --cflags gssapi 2>/dev/null`
|
||||
if test -n "$GSSAPI_DIR" ; then
|
||||
AC_PATH_PROG(KRB5CONFIG, krb5-config, :, [$GSSAPI_DIR/bin:$PATH:/usr/bin])
|
||||
else
|
||||
AC_PATH_PROG(KRB5CONFIG, krb5-config, :, [$PATH:/usr/bin])
|
||||
fi
|
||||
if test -n "$KRB5CONFIG" -a -x "$KRB5CONFIG" ; then
|
||||
TMP_GSSAPI_LIBS=`$KRB5CONFIG --libs gssapi 2>/dev/null`
|
||||
TMP_GSSAPI_INCLUDES=`$KRB5CONFIG --cflags gssapi 2>/dev/null`
|
||||
|
||||
LIBS="$LIBS $TMP_GSSAPI_LIBS"
|
||||
AC_CHECK_LIB(gssapi, gss_init_sec_context,
|
||||
@ -5701,7 +5788,13 @@ if test "$SKIP_IDL_CHECK" = "no"
|
||||
then
|
||||
_LIBIDL_FOUND=
|
||||
if test "$MACOS_SDK_DIR"; then
|
||||
dnl xpidl, and therefore libIDL, is only needed on the build host.
|
||||
dnl Don't build it against the SDK, as that causes problems.
|
||||
_MACSAVE_CFLAGS="$CFLAGS"
|
||||
_MACSAVE_LIBS="$LIBS"
|
||||
_MACSAVE_NEXT_ROOT="$NEXT_ROOT"
|
||||
changequote(,)
|
||||
CFLAGS=`echo $CFLAGS|sed -E -e "s%((-I|-isystem )${MACOS_SDK_DIR}/usr/(include|lib/gcc)[^ ]*)|-F${MACOS_SDK_DIR}(/System)?/Library/Frameworks[^ ]*|-nostdinc[^ ]*%%g"`
|
||||
LIBS=`echo $LIBS|sed -e "s?-L${MACOS_SDK_DIR}/usr/lib[^ ]*??g"`
|
||||
changequote([,])
|
||||
unset NEXT_ROOT
|
||||
@ -5720,6 +5813,7 @@ then
|
||||
if test -z "$_LIBIDL_FOUND" && test -z "$CROSS_COMPILE"; then
|
||||
AC_PATH_PROGS(ORBIT_CONFIG, $ORBIT_CONFIG orbit-config)
|
||||
if test -n "$ORBIT_CONFIG"; then
|
||||
AC_MSG_CHECKING([for ORBit libIDL usability])
|
||||
_ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags`
|
||||
_ORBIT_LIBS=`${ORBIT_CONFIG} client --libs`
|
||||
_ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}`
|
||||
@ -5727,7 +5821,31 @@ then
|
||||
LIBIDL_CFLAGS="$_ORBIT_INC_PATH"
|
||||
LIBIDL_LIBS="$_ORBIT_LIB_PATH -lIDL -lglib"
|
||||
LIBIDL_CONFIG=
|
||||
_LIBIDL_FOUND=1
|
||||
_SAVE_CFLAGS="$CFLAGS"
|
||||
_SAVE_LIBS="$LIBS"
|
||||
CFLAGS="$LIBIDL_CFLAGS $CFLAGS"
|
||||
LIBS="$LIBIDL_LIBS $LIBS"
|
||||
AC_TRY_RUN([
|
||||
#include <stdlib.h>
|
||||
#include <libIDL/IDL.h>
|
||||
int main() {
|
||||
char *s;
|
||||
s=strdup(IDL_get_libver_string());
|
||||
if(s==NULL) {
|
||||
exit(1);
|
||||
}
|
||||
exit(0);
|
||||
}
|
||||
], [_LIBIDL_FOUND=1
|
||||
result="yes"],
|
||||
[LIBIDL_CFLAGS=
|
||||
LIBIDL_LIBS=
|
||||
result="no"],
|
||||
[_LIBIDL_FOUND=1
|
||||
result="maybe"] )
|
||||
AC_MSG_RESULT($result)
|
||||
CFLAGS="$_SAVE_CFLAGS"
|
||||
LIBS="$_SAVE_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test -z "$_LIBIDL_FOUND"; then
|
||||
@ -5735,8 +5853,9 @@ then
|
||||
libIDL $LIBIDL_VERSION or higher is required.])
|
||||
fi
|
||||
if test "$MACOS_SDK_DIR"; then
|
||||
LIBS="-L${MACOS_SDK_DIR}/usr/lib/gcc/darwin/${GCC_VERSION} -L${MACOS_SDK_DIR}/usr/lib $LIBS"
|
||||
export NEXT_ROOT=$MACOS_SDK_DIR
|
||||
CFLAGS="$_MACSAVE_CFLAGS"
|
||||
LIBS="$_MACSAVE_LIBS"
|
||||
export NEXT_ROOT="$_MACSAVE_NEXT_ROOT"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
<?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>PrintPDE</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string></string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string></string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.mozilla.pde.MOZZ</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>PrintPDE</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>BNDL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>MOZZ</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0</string>
|
||||
<key>CFPlugInDynamicRegistration</key>
|
||||
<string>NO</string>
|
||||
<key>CFPlugInFactories</key>
|
||||
<dict>
|
||||
<key>00000000-0000-0000-0000-000000000000</key>
|
||||
<string>MyCFPlugInFactory</string>
|
||||
</dict>
|
||||
<key>CFPlugInTypes</key>
|
||||
<dict>
|
||||
<key>BCB07250-E57F-11D3-8CA6-0050E4603277</key>
|
||||
<array>
|
||||
<string>00000000-0000-0000-0000-000000000000</string>
|
||||
</array>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
@ -52,17 +52,20 @@ PACKAGE_FILE = printpde.pkg
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
unexport CC CXX
|
||||
|
||||
ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
|
||||
ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
|
||||
export::
|
||||
rsync -a --exclude .DS_Store --exclude "CVS/" $(srcdir)/PrintPDE.pbproj .
|
||||
rsync -a --exclude .DS_Store --exclude "CVS/" $(srcdir)/PrintPDE.xcode .
|
||||
ln -fs $(srcdir)/src
|
||||
ln -fs $(srcdir)/res
|
||||
ln -fs $(srcdir)/public
|
||||
ln -fs $(srcdir)/Info-*.plist .
|
||||
endif
|
||||
|
||||
libs::
|
||||
$(PBBUILD) -buildstyle $(BUILDSTYLE) install
|
||||
$(PBBUILD) -project PrintPDE.xcode -target PrintPDE -buildstyle $(BUILDSTYLE) install $(PBBUILD_SETTINGS)
|
||||
mkdir -p $(DIST)/package
|
||||
cp -R build/UninstalledProducts/PrintPDE.plugin $(DIST)/package/
|
||||
|
||||
|
||||
@ -0,0 +1,426 @@
|
||||
// !$*UTF8*$!
|
||||
{
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 39;
|
||||
objects = {
|
||||
01823927FFE8053411CA24C1 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = wrapper.framework;
|
||||
name = Carbon.framework;
|
||||
path = /System/Library/Frameworks/Carbon.framework;
|
||||
refType = 0;
|
||||
sourceTree = "<absolute>";
|
||||
};
|
||||
01ACF443FFC1C83D11CA2470 = {
|
||||
buildSettings = {
|
||||
COPY_PHASE_STRIP = NO;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
OPTIMIZATION_CFLAGS = "-O0";
|
||||
ZERO_LINK = YES;
|
||||
};
|
||||
isa = PBXBuildStyle;
|
||||
name = Development;
|
||||
};
|
||||
01ACF444FFC1C83D11CA2470 = {
|
||||
buildSettings = {
|
||||
COPY_PHASE_STRIP = YES;
|
||||
GCC_ENABLE_FIX_AND_CONTINUE = NO;
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
||||
ZERO_LINK = NO;
|
||||
};
|
||||
isa = PBXBuildStyle;
|
||||
name = Deployment;
|
||||
};
|
||||
//010
|
||||
//011
|
||||
//012
|
||||
//013
|
||||
//014
|
||||
//080
|
||||
//081
|
||||
//082
|
||||
//083
|
||||
//084
|
||||
089C1669FE841209C02AAC07 = {
|
||||
buildSettings = {
|
||||
};
|
||||
buildStyles = (
|
||||
01ACF443FFC1C83D11CA2470,
|
||||
01ACF444FFC1C83D11CA2470,
|
||||
);
|
||||
hasScannedForEncodings = 0;
|
||||
isa = PBXProject;
|
||||
mainGroup = 089C166AFE841209C02AAC07;
|
||||
projectDirPath = "";
|
||||
targets = (
|
||||
4D1684240830212700080847,
|
||||
);
|
||||
};
|
||||
089C166AFE841209C02AAC07 = {
|
||||
children = (
|
||||
F849B8C8029C68B901CB2098,
|
||||
089C1671FE841209C02AAC07,
|
||||
19C28FB6FE9D52B211CA2CBB,
|
||||
4D1684340830212700080847,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = CFPlugInBundle;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
089C1671FE841209C02AAC07 = {
|
||||
children = (
|
||||
01823927FFE8053411CA24C1,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "External Frameworks and Libraries";
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
//080
|
||||
//081
|
||||
//082
|
||||
//083
|
||||
//084
|
||||
//190
|
||||
//191
|
||||
//192
|
||||
//193
|
||||
//194
|
||||
19C28FB6FE9D52B211CA2CBB = {
|
||||
children = (
|
||||
4D1684350830212700080847,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = Products;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
//190
|
||||
//191
|
||||
//192
|
||||
//193
|
||||
//194
|
||||
//4D0
|
||||
//4D1
|
||||
//4D2
|
||||
//4D3
|
||||
//4D4
|
||||
4D1684240830212700080847 = {
|
||||
buildPhases = (
|
||||
4D1684250830212700080847,
|
||||
4D16842A0830212700080847,
|
||||
4D16842D0830212700080847,
|
||||
4D1684310830212700080847,
|
||||
4D1684330830212700080847,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
buildSettings = {
|
||||
FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks\"";
|
||||
GCC_OPTIMIZATION_LEVEL = 2;
|
||||
HEADER_SEARCH_PATHS = .;
|
||||
INFOPLIST_FILE = "Info-PrintPDE.plist";
|
||||
INSTALL_MODE_FLAG = "u+w";
|
||||
OTHER_CFLAGS = "";
|
||||
OTHER_LDFLAGS = "-bundle";
|
||||
PRODUCT_NAME = PrintPDE;
|
||||
SECTORDER_FLAGS = "";
|
||||
WARNING_CFLAGS = "-Wall -Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
|
||||
WRAPPER_EXTENSION = plugin;
|
||||
};
|
||||
dependencies = (
|
||||
);
|
||||
isa = PBXNativeTarget;
|
||||
name = PrintPDE;
|
||||
productName = PrintDialogPDE.plugin;
|
||||
productReference = 4D1684350830212700080847;
|
||||
productType = "com.apple.product-type.bundle";
|
||||
};
|
||||
4D1684250830212700080847 = {
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
4D1684260830212700080847,
|
||||
4D1684270830212700080847,
|
||||
4D1684280830212700080847,
|
||||
4D1684290830212700080847,
|
||||
);
|
||||
isa = PBXHeadersBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
4D1684260830212700080847 = {
|
||||
fileRef = F73AA2D2026B518801CB2098;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684270830212700080847 = {
|
||||
fileRef = F73AA2D3026B518801CB2098;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684280830212700080847 = {
|
||||
fileRef = F73AA2D4026B518801CB2098;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684290830212700080847 = {
|
||||
fileRef = F57C986203B8293D01202892;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D16842A0830212700080847 = {
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
4D16842B0830212700080847,
|
||||
4D16842C0830212700080847,
|
||||
);
|
||||
isa = PBXResourcesBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
4D16842B0830212700080847 = {
|
||||
fileRef = F73AA2D8026B518801CB2098;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D16842C0830212700080847 = {
|
||||
fileRef = F73AA2DA026B518801CB2098;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D16842D0830212700080847 = {
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
4D16842E0830212700080847,
|
||||
4D16842F0830212700080847,
|
||||
4D1684300830212700080847,
|
||||
);
|
||||
isa = PBXSourcesBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
4D16842E0830212700080847 = {
|
||||
fileRef = F73AA2DD026B518801CB2098;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D16842F0830212700080847 = {
|
||||
fileRef = F73AA2DE026B518801CB2098;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684300830212700080847 = {
|
||||
fileRef = F73AA2DF026B518801CB2098;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684310830212700080847 = {
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
4D1684320830212700080847,
|
||||
);
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
4D1684320830212700080847 = {
|
||||
fileRef = 01823927FFE8053411CA24C1;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684330830212700080847 = {
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
isa = PBXRezBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
4D1684340830212700080847 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.xml;
|
||||
path = "Info-PrintPDE.plist";
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4D1684350830212700080847 = {
|
||||
explicitFileType = wrapper.cfbundle;
|
||||
includeInIndex = 0;
|
||||
isa = PBXFileReference;
|
||||
path = PrintPDE.plugin;
|
||||
refType = 3;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
//4D0
|
||||
//4D1
|
||||
//4D2
|
||||
//4D3
|
||||
//4D4
|
||||
//F50
|
||||
//F51
|
||||
//F52
|
||||
//F53
|
||||
//F54
|
||||
F57C986203B8293D01202892 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = sourcecode.c.h;
|
||||
path = nsPDECommon.h;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F586CCD503BC184501202892 = {
|
||||
children = (
|
||||
F57C986203B8293D01202892,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
path = public;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
//F50
|
||||
//F51
|
||||
//F52
|
||||
//F53
|
||||
//F54
|
||||
//F70
|
||||
//F71
|
||||
//F72
|
||||
//F73
|
||||
//F74
|
||||
F73AA2D2026B518801CB2098 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = sourcecode.c.h;
|
||||
path = PDECore.h;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F73AA2D3026B518801CB2098 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = sourcecode.c.h;
|
||||
path = PDECustom.h;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F73AA2D4026B518801CB2098 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = sourcecode.c.h;
|
||||
path = PDEUtilities.h;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F73AA2D5026B518801CB2098 = {
|
||||
children = (
|
||||
F73AA2D8026B518801CB2098,
|
||||
F73AA2DA026B518801CB2098,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
path = res;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F73AA2D8026B518801CB2098 = {
|
||||
children = (
|
||||
F73AA2D9026B518801CB2098,
|
||||
);
|
||||
isa = PBXVariantGroup;
|
||||
name = Localizable.strings;
|
||||
path = "";
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F73AA2D9026B518801CB2098 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.plist.strings;
|
||||
name = English;
|
||||
path = English.lproj/Localizable.strings;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F73AA2DA026B518801CB2098 = {
|
||||
children = (
|
||||
F73AA2DB026B518801CB2098,
|
||||
);
|
||||
isa = PBXVariantGroup;
|
||||
name = PrintPDE.nib;
|
||||
path = "";
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F73AA2DB026B518801CB2098 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = wrapper.nib;
|
||||
name = English;
|
||||
path = English.lproj/PrintPDE.nib;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F73AA2DC026B518801CB2098 = {
|
||||
children = (
|
||||
F73AA2DD026B518801CB2098,
|
||||
F73AA2D2026B518801CB2098,
|
||||
F73AA2DE026B518801CB2098,
|
||||
F73AA2D3026B518801CB2098,
|
||||
F73AA2DF026B518801CB2098,
|
||||
F73AA2D4026B518801CB2098,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
path = src;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F73AA2DD026B518801CB2098 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = sourcecode.c.c;
|
||||
path = PDECore.c;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F73AA2DE026B518801CB2098 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = sourcecode.c.c;
|
||||
path = PDECustom.c;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F73AA2DF026B518801CB2098 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = sourcecode.c.c;
|
||||
path = PDEUtilities.c;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
//F70
|
||||
//F71
|
||||
//F72
|
||||
//F73
|
||||
//F74
|
||||
//F80
|
||||
//F81
|
||||
//F82
|
||||
//F83
|
||||
//F84
|
||||
F849B8C8029C68B901CB2098 = {
|
||||
children = (
|
||||
F586CCD503BC184501202892,
|
||||
F73AA2DC026B518801CB2098,
|
||||
F73AA2D5026B518801CB2098,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = PrintPDE;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
};
|
||||
rootObject = 089C1669FE841209C02AAC07;
|
||||
}
|
||||
@ -100,7 +100,10 @@ endif
|
||||
endif
|
||||
|
||||
ifdef MACOS_SDK_DIR
|
||||
# xpidl is for the build host, pull out the cross-compilation stuff
|
||||
NEXT_ROOT=
|
||||
OS_CFLAGS := $(shell echo $(OS_CFLAGS)|sed -E -e "s%((-I|-isystem )$(MACOS_SDK_DIR)/usr/(include|lib/gcc)[^ ]*)|-F$(MACOS_SDK_DIR)(/System)?/Library/Frameworks[^ ]*|-nostdinc[^ ]*%%g")
|
||||
OS_CFLAGS := $(patsubst -I$(MACOS_SDK_DIR)%,-I%,$(OS_CFLAGS))
|
||||
OS_LIBS := $(patsubst -L$(MACOS_SDK_DIR)/usr/lib%,,$(OS_LIBS))
|
||||
endif
|
||||
|
||||
|
||||
@ -37,7 +37,9 @@
|
||||
#include <math.h>
|
||||
#include "cairo-atsui.h"
|
||||
#include "cairoint.h"
|
||||
#if 0
|
||||
#include <iconv.h>
|
||||
#endif
|
||||
|
||||
// FixedToFloat/FloatToFixed are 10.3 SDK items - include definitions
|
||||
// here so we can use older SDKs
|
||||
|
||||
@ -102,10 +102,10 @@ EXTRA_DEPS = $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(LIBS_DIR) \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
$(TK_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(MOZ_UNICHARUTIL_LIBS) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX) \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
|
||||
@ -508,6 +508,7 @@ extern int nr_RenameFile(char *from, char *to)
|
||||
|
||||
|
||||
#ifdef STANDALONE_REGISTRY
|
||||
#ifndef XP_MACOSX
|
||||
char *strdup(const char *source)
|
||||
{
|
||||
char *newAllocation;
|
||||
@ -522,7 +523,6 @@ char *strdup(const char *source)
|
||||
return newAllocation;
|
||||
}
|
||||
|
||||
#ifndef XP_MACOSX
|
||||
int strcasecmp(const char *str1, const char *str2)
|
||||
{
|
||||
char currentChar1, currentChar2;
|
||||
|
||||
@ -0,0 +1,368 @@
|
||||
// !$*UTF8*$!
|
||||
{
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 39;
|
||||
objects = {
|
||||
089C1669FE841209C02AAC07 = {
|
||||
buildSettings = {
|
||||
};
|
||||
buildStyles = (
|
||||
4F9091AC011F3BD104CA0E50,
|
||||
4F9091AD011F3BD104CA0E50,
|
||||
F50EB520038ABFA401A9666E,
|
||||
);
|
||||
hasScannedForEncodings = 1;
|
||||
isa = PBXProject;
|
||||
mainGroup = 089C166AFE841209C02AAC07;
|
||||
projectDirPath = "";
|
||||
targets = (
|
||||
4D16849D0830226300080847,
|
||||
);
|
||||
};
|
||||
089C166AFE841209C02AAC07 = {
|
||||
children = (
|
||||
08FB77ADFE841716C02AAC07,
|
||||
089C167CFE841241C02AAC07,
|
||||
089C1671FE841209C02AAC07,
|
||||
19C28FB4FE9D528D11CA2CBB,
|
||||
4D1684AC0830226300080847,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = MRJPlugin;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
089C1671FE841209C02AAC07 = {
|
||||
children = (
|
||||
F5A7D3AB036E359F01A96660,
|
||||
08EA7FFBFE8413EDC02AAC07,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "External Frameworks and Libraries";
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
089C167CFE841241C02AAC07 = {
|
||||
children = (
|
||||
089C167DFE841241C02AAC07,
|
||||
F5E0C34D036A12DF01A96660,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = Resources;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
089C167DFE841241C02AAC07 = {
|
||||
children = (
|
||||
089C167EFE841241C02AAC07,
|
||||
);
|
||||
isa = PBXVariantGroup;
|
||||
name = InfoPlist.strings;
|
||||
path = "";
|
||||
refType = 2;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
089C167EFE841241C02AAC07 = {
|
||||
fileEncoding = 10;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.plist.strings;
|
||||
name = English;
|
||||
path = English.lproj/InfoPlist.strings;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
08EA7FFBFE8413EDC02AAC07 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = wrapper.framework;
|
||||
name = Carbon.framework;
|
||||
path = /System/Library/Frameworks/Carbon.framework;
|
||||
refType = 0;
|
||||
sourceTree = "<absolute>";
|
||||
};
|
||||
08FB77ADFE841716C02AAC07 = {
|
||||
children = (
|
||||
0F64AF2C0433C8A200A96652,
|
||||
F5E0C34F036A130901A96660,
|
||||
F5E0C351036A130E01A96660,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = Source;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
//080
|
||||
//081
|
||||
//082
|
||||
//083
|
||||
//084
|
||||
//0F0
|
||||
//0F1
|
||||
//0F2
|
||||
//0F3
|
||||
//0F4
|
||||
0F64AF2C0433C8A200A96652 = {
|
||||
fileEncoding = 4;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = sourcecode.c.h;
|
||||
path = DefaultPluginPrefix.h;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
//0F0
|
||||
//0F1
|
||||
//0F2
|
||||
//0F3
|
||||
//0F4
|
||||
//190
|
||||
//191
|
||||
//192
|
||||
//193
|
||||
//194
|
||||
19C28FB4FE9D528D11CA2CBB = {
|
||||
children = (
|
||||
4D1684AD0830226300080847,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = Products;
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
//190
|
||||
//191
|
||||
//192
|
||||
//193
|
||||
//194
|
||||
//4D0
|
||||
//4D1
|
||||
//4D2
|
||||
//4D3
|
||||
//4D4
|
||||
4D16849D0830226300080847 = {
|
||||
buildPhases = (
|
||||
4D16849F0830226300080847,
|
||||
4D1684A10830226300080847,
|
||||
4D1684A30830226300080847,
|
||||
4D1684A60830226300080847,
|
||||
4D1684A90830226300080847,
|
||||
4D1684AB0830226300080847,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
buildSettings = {
|
||||
FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreFoundation.framework\"";
|
||||
GCC_PREFIX_HEADER = DefaultPluginPrefix.h;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = "XP_MACOSX=1 NO_X11=1 USE_SYSTEM_CONSOLE=1";
|
||||
HEADER_SEARCH_PATHS = "../../../../../dist/sdk/xpcom/include ../../../../../dist/include/caps ../../../../../dist/include/java ../../../../../dist/include/js ../../../../../dist/include/nspr ../../../../../dist/include/nspr/obsolete ../../../../../dist/include/oji ../../../../../dist/include/plugin ../../../../../dist/include/xpcom ../../../../../dist/include/xpconnect ../../../../../dist/include /Developer/Headers/FlatCarbon";
|
||||
INFOPLIST_FILE = "Info-DefaultPlugin.plist";
|
||||
LIBRARY_SEARCH_PATHS = /usr/lib;
|
||||
OTHER_CFLAGS = "";
|
||||
OTHER_LDFLAGS = "";
|
||||
OTHER_REZFLAGS = "";
|
||||
PRODUCT_NAME = "Default Plugin";
|
||||
SECTORDER_FLAGS = "";
|
||||
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
|
||||
WRAPPER_EXTENSION = plugin;
|
||||
};
|
||||
dependencies = (
|
||||
);
|
||||
isa = PBXNativeTarget;
|
||||
name = "Default Plugin";
|
||||
productName = MRJPlugin;
|
||||
productReference = 4D1684AD0830226300080847;
|
||||
productType = "com.apple.product-type.bundle";
|
||||
};
|
||||
4D16849F0830226300080847 = {
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
4D1684A00830226300080847,
|
||||
);
|
||||
isa = PBXHeadersBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
4D1684A00830226300080847 = {
|
||||
fileRef = 0F64AF2C0433C8A200A96652;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684A10830226300080847 = {
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
4D1684A20830226300080847,
|
||||
);
|
||||
isa = PBXResourcesBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
4D1684A20830226300080847 = {
|
||||
fileRef = 089C167DFE841241C02AAC07;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684A30830226300080847 = {
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
4D1684A40830226300080847,
|
||||
4D1684A50830226300080847,
|
||||
);
|
||||
isa = PBXSourcesBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
4D1684A40830226300080847 = {
|
||||
fileRef = F5E0C34F036A130901A96660;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684A50830226300080847 = {
|
||||
fileRef = F5E0C351036A130E01A96660;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684A60830226300080847 = {
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
4D1684A70830226300080847,
|
||||
4D1684A80830226300080847,
|
||||
);
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
4D1684A70830226300080847 = {
|
||||
fileRef = 08EA7FFBFE8413EDC02AAC07;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684A80830226300080847 = {
|
||||
fileRef = F5A7D3AB036E359F01A96660;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684A90830226300080847 = {
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
4D1684AA0830226300080847,
|
||||
);
|
||||
isa = PBXRezBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
4D1684AA0830226300080847 = {
|
||||
fileRef = F5E0C34D036A12DF01A96660;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
4D1684AB0830226300080847 = {
|
||||
buildActionMask = 2147483647;
|
||||
dstPath = "";
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
);
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
4D1684AC0830226300080847 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = text.xml;
|
||||
path = "Info-DefaultPlugin.plist";
|
||||
refType = 4;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4D1684AD0830226300080847 = {
|
||||
explicitFileType = wrapper.cfbundle;
|
||||
includeInIndex = 0;
|
||||
isa = PBXFileReference;
|
||||
path = "Default Plugin.plugin";
|
||||
refType = 3;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
//4D0
|
||||
//4D1
|
||||
//4D2
|
||||
//4D3
|
||||
//4D4
|
||||
//4F0
|
||||
//4F1
|
||||
//4F2
|
||||
//4F3
|
||||
//4F4
|
||||
4F9091AC011F3BD104CA0E50 = {
|
||||
buildSettings = {
|
||||
COPY_PHASE_STRIP = NO;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
OPTIMIZATION_CFLAGS = "-O0";
|
||||
ZERO_LINK = YES;
|
||||
};
|
||||
isa = PBXBuildStyle;
|
||||
name = Development;
|
||||
};
|
||||
4F9091AD011F3BD104CA0E50 = {
|
||||
buildSettings = {
|
||||
COPY_PHASE_STRIP = YES;
|
||||
GCC_ENABLE_FIX_AND_CONTINUE = NO;
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
||||
ZERO_LINK = NO;
|
||||
};
|
||||
isa = PBXBuildStyle;
|
||||
name = Deployment;
|
||||
};
|
||||
//4F0
|
||||
//4F1
|
||||
//4F2
|
||||
//4F3
|
||||
//4F4
|
||||
//F50
|
||||
//F51
|
||||
//F52
|
||||
//F53
|
||||
//F54
|
||||
F50EB520038ABFA401A9666E = {
|
||||
buildSettings = {
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUGGING_SYMBOLS = YES;
|
||||
};
|
||||
isa = PBXBuildStyle;
|
||||
name = DeploymentSymbols;
|
||||
};
|
||||
F5A7D3AB036E359F01A96660 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = wrapper.framework;
|
||||
name = CoreFoundation.framework;
|
||||
path = /System/Library/Frameworks/CoreFoundation.framework;
|
||||
refType = 0;
|
||||
sourceTree = "<absolute>";
|
||||
};
|
||||
F5E0C34D036A12DF01A96660 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = file;
|
||||
path = _NullPlugin.rsrc;
|
||||
refType = 2;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
F5E0C34F036A130901A96660 = {
|
||||
fileEncoding = 30;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = sourcecode.cpp.cpp;
|
||||
path = NullPlugin.cpp;
|
||||
refType = 2;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
F5E0C351036A130E01A96660 = {
|
||||
fileEncoding = 30;
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = sourcecode.cpp.cpp;
|
||||
path = npmac.cpp;
|
||||
refType = 2;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
};
|
||||
rootObject = 089C1669FE841209C02AAC07;
|
||||
}
|
||||
24
modules/plugin/samples/default/mac/Info-DefaultPlugin.plist
Normal file
24
modules/plugin/samples/default/mac/Info-DefaultPlugin.plist
Normal file
@ -0,0 +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>Default Plugin</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string></string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.netscape.DefaultPlugin</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>NSPL</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>MOSS</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0</string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
@ -60,6 +60,8 @@ PACKAGE_FILE = npnul.pkg
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
unexport CC CXX
|
||||
|
||||
# decodes resource files from AppleSingle to Resource Manager format.
|
||||
ASDECODE = $(DIST)/bin/asdecode
|
||||
RESOURCE_FILES = _NullPlugin.rsrc
|
||||
@ -68,11 +70,12 @@ RESOURCE_FILES = _NullPlugin.rsrc
|
||||
ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
|
||||
ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
|
||||
export::
|
||||
rsync -a --exclude .DS_Store --exclude "CVS/" $(srcdir)/DefaultPlugin.pbproj .
|
||||
rsync -a --exclude .DS_Store --exclude "CVS/" $(srcdir)/DefaultPlugin.xcode .
|
||||
ln -fs $(srcdir)/English.lproj
|
||||
ln -fs $(srcdir)/DefaultPluginPrefix.h
|
||||
ln -fs $(srcdir)/NullPlugin.cpp
|
||||
ln -fs $(srcdir)/npmac.cpp
|
||||
ln -fs $(srcdir)/Info-*.plist .
|
||||
endif
|
||||
|
||||
all:: build-plugin
|
||||
@ -86,7 +89,8 @@ install-plugin: build-plugin
|
||||
resources: $(RESOURCE_FILES)
|
||||
|
||||
build-plugin: resources
|
||||
$(PBBUILD) -target $(TARGET) -buildstyle $(BUILDSTYLE)
|
||||
$(PBBUILD) -project DefaultPlugin.xcode -target $(TARGET) -buildstyle $(BUILDSTYLE) $(PBBUILD_SETTINGS)
|
||||
echo -n NSPLMOSS > "build/DefaultPlugin.build/Default Plugin.build/PkgInfo"
|
||||
|
||||
_%.rsrc: %.rsrc
|
||||
$(ASDECODE) $< $@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user