mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 00:01:33 -08:00
Code Issues Projects Releases Wiki Activity

Improvements to the mps build/installation process:

Browse source 
1. Build eventtxt on Mac OS X (add "eventtxt" as dependency for "all" target).
2. In configure, check for the existence of the header "sqlite3.h" and set EXTRA_TARGETS accordingly.
3. In top-level Makefile, install all targets in EXTRA_TARGETS.

Copied from Perforce
 Change: 180907
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2013-02-05 13:34:42 +00:00
parent 51b123525e
commit e12d5890e3
4 changed files with 997 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mps/Makefile.in
View file

@ -14,6 +14,7 @@ INSTALL_DATA=@INSTALL_DATA@
INSTALL_PROGRAM=@INSTALL_PROGRAM@
MAKE=@MAKE@
MPS_TARGET_NAME=@MPS_TARGET_NAME@
EXTRA_TARGETS=@EXTRA_TARGETS@
prefix=$(DESTDIR)@prefix@
all: @BUILD_TARGET@
@ -28,7 +29,7 @@ install-make-build: make-install-dirs build-via-make
$(INSTALL_DATA) code/mps*.h $(prefix)/include/
$(INSTALL_DATA) code/$(MPS_TARGET_NAME)/cool/mps.a $(prefix)/lib/libmps-debug.a
$(INSTALL_DATA) code/$(MPS_TARGET_NAME)/hot/mps.a $(prefix)/lib/libmps.a
$(INSTALL_PROGRAM) code/$(MPS_TARGET_NAME)/hot/eventcnv $(prefix)/bin/mpseventcnv
for PROGRAM in $(EXTRA_TARGETS); do $(INSTALL_PROGRAM) code/$(MPS_TARGET_NAME)/hot/$$PROGRAM $(prefix)/bin/mps$$PROGRAM; done
build-via-xcode:
xcodebuild -project code/mps.xcodeproj -config Release
@ -42,8 +43,7 @@ install-xcode-build: make-install-dirs build-via-xcode
$(INSTALL_DATA) code/mps*.h $(prefix)/include/
$(INSTALL_DATA) code/xc/Debug/libmps.a $(prefix)/lib/libmps-debug.a
$(INSTALL_DATA) code/xc/Release/libmps.a $(prefix)/lib/libmps.a
$(INSTALL_PROGRAM) code/xc/Release/eventcnv $(prefix)/bin/mpseventcnv
$(INSTALL_PROGRAM) code/xc/Release/eventsql $(prefix)/bin/mpseventsql
for PROGRAM in $(EXTRA_TARGETS); do $(INSTALL_PROGRAM) code/xc/Release/$$PROGRAM $(prefix)/bin/mps$$PROGRAM; done
Makefile: Makefile.in config.status
./config.status Makefile

29
mps/code/mps.xcodeproj/project.pbxproj
View file

@ -13,9 +13,10 @@
buildPhases = (
);
dependencies = (
2D07B9791636FCBD00DB751B /* PBXTargetDependency */,
3104AFF6156D37BC000A585A /* PBXTargetDependency */,
3114A6D5156E9839001E0AA3 /* PBXTargetDependency */,
2D07B9791636FCBD00DB751B /* PBXTargetDependency */,
22E16A8916C141020090AD9F /* PBXTargetDependency */,
3114A6B9156E9763001E0AA3 /* PBXTargetDependency */,
3114A6A7156E9739001E0AA3 /* PBXTargetDependency */,
3114A68D156E9686001E0AA3 /* PBXTargetDependency */,
@ -201,6 +202,13 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
22E16A8816C141020090AD9F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 2D604B9B16514B1A003AAF46;
remoteInfo = eventtxt;
};
2D07B9781636FCBD00DB751B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
@ -2184,7 +2192,7 @@
31EEABDA156AAE9E00714D05 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0440;
LastUpgradeCheck = 0460;
};
buildConfigurationList = 31EEABDD156AAE9E00714D05 /* Build configuration list for PBXProject "mps" */;
compatibilityVersion = "Xcode 3.2";
@ -2585,6 +2593,11 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
22E16A8916C141020090AD9F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 2D604B9B16514B1A003AAF46 /* eventtxt */;
targetProxy = 22E16A8816C141020090AD9F /* PBXContainerItemProxy */;
};
2D07B9791636FCBD00DB751B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 2D07B9701636FC9900DB751B /* eventsql */;
@ -2988,6 +3001,7 @@
3104AFF3156D37A0000A585A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
@ -2996,6 +3010,7 @@
3104AFF4156D37A0000A585A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
@ -3284,9 +3299,10 @@
318387EB15DC30CC008E4EA0 /* WE */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = ansi;
GCC_OPTIMIZATION_LEVEL = 2;
@ -3337,6 +3353,7 @@
318387EC15DC30CC008E4EA0 /* WE */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
@ -3649,9 +3666,10 @@
31EEABDF156AAE9E00714D05 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = ansi;
GCC_OPTIMIZATION_LEVEL = 0;
@ -3703,9 +3721,10 @@
31EEABE0156AAE9E00714D05 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = ansi;
GCC_OPTIMIZATION_LEVEL = 2;

966
mps/configure vendored
View file

File diff suppressed because it is too large Load diff

6
mps/configure.ac
View file

@ -83,6 +83,11 @@ case $host in
AC_MSG_ERROR([MPS does not support this platform out of the box. See manual/build.txt])
esac
EXTRA_TARGETS="eventcnv"
AC_LANG_PUSH([C++])
AC_CHECK_HEADER([sqlite3.h], [EXTRA_TARGETS+=" eventsql"])
AC_LANG_POP([C++])
AC_CHECK_PROGS([MAKE],[gnumake gmake make],[AC_MSG_ERROR([Unable to find a make program.])])
if ! $MAKE --version | grep -q "GNU" 2> /dev/null; then
AC_MSG_ERROR([MPS requires GNU make to build from configure, but see manual/build.txt])
@ -92,6 +97,7 @@ AC_SUBST(MPS_TARGET_NAME)
AC_SUBST(BUILD_TARGET)
AC_SUBST(CLEAN_TARGET)
AC_SUBST(INSTALL_TARGET)
AC_SUBST(EXTRA_TARGETS)
AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(CPPFLAGS)