diff options
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/Framework.mk | 71 | ||||
| -rw-r--r-- | cocoa/SciTest.mk | 36 | ||||
| -rwxr-xr-x | cocoa/checkbuildosx.sh | 70 | ||||
| -rw-r--r-- | cocoa/common.mk | 57 |
4 files changed, 25 insertions, 209 deletions
diff --git a/cocoa/Framework.mk b/cocoa/Framework.mk deleted file mode 100644 index ba9fa16f0..000000000 --- a/cocoa/Framework.mk +++ /dev/null @@ -1,71 +0,0 @@ -### start defines ### -include common.mk - -INST_NAME=-install_name \ - @executable_path/../Frameworks/Sci.framework/Versions/A/Sci - -LD=gcc $(ARCH) -dynamiclib -framework Cocoa $(INST_NAME) - -LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx)))) - -SCI_LEXERS=$(LEXOBJS) \ - LexerBase.o LexerModule.o LexerSimple.o Accessor.o - -SCI_OBJ=AutoComplete.o CallTip.o CellBuffer.o CharClassify.o \ - ContractionState.o Decoration.o Document.o Editor.o \ - ExternalLexer.o Indicator.o KeyMap.o LineMarker.o PerLine.o \ - PositionCache.o PropSetSimple.o RESearch.o RunStyles.o ScintillaBase.o Style.o \ - StyleContext.o UniConversion.o ViewStyle.o XPM.o WordList.o \ - Selection.o CharacterSet.o Catalogue.o $(SCI_LEXERS) - -WAH_OBJ=DocumentAccessor.o KeyWords.o WindowAccessor.o - -COC_OBJ=PlatCocoa.o ScintillaCocoa.o ScintillaView.o InfoBar.o - -OBJ=$(SCI_OBJ) $(UNUSED_OBJ) $(COC_OBJ) -OBJS=$(addprefix $(FRM_BLD)/,$(OBJ)) - -TARG=$(APP)/Versions/A/Sci -APP=$(FRM_BLD)/Sci.framework -### end defines ### - -### start targets ### - -all: $(FRM_BLD) $(TARG) - -cleanfrm: - -rm -rf $(FRM_BLD) - -$(APP): $(FRM_BLD) - -rm -rf $(APP) - -mkdir $(APP) - -mkdir $(APP)/Versions - -mkdir $(APP)/Versions/A - -mkdir $(APP)/Versions/A/Headers - -mkdir $(APP)/Versions/A/Resources - -ln -sf `pwd`/$(APP)/Versions/A `pwd`/$(APP)/Versions/Current - -ln -sf `pwd`/$(APP)/Versions/A/Headers `pwd`/$(APP)/Headers - -ln -sf `pwd`/$(APP)/Versions/A/Resources `pwd`/$(APP)/Resources - -cp *.h $(APP)/Headers/ - -cp ../src/*.h $(APP)/Headers/ - -cp ../include/*.h $(APP)/Headers/ - -cp -R ScintillaFramework/English.lproj $(APP)/Resources - -cp res/*.png $(APP)/Resources - -cp ScintillaFramework/Info.plist $(APP)/Resources - -$(TARG) : $(OBJS) $(APP) - $(LD) $(OBJS) $(gDEFs) -o $(TARG) -lstdc++ - -ln `pwd`/$(TARG) `pwd`/$(APP)/Sci - -$(FRM_BLD): - -mkdir $(BLD) - -mkdir $(FRM_BLD) - -### get around to filling out the real dependencies later ### -#$(FRM_BLD)/AutoComplete.o : ../src/AutoComplete.cxx ../src/AutoComplete.h \ -# ../include/Platform.h - -#$(FRM_BLD)/CallTip.o : ../src/CallTip.cxx ../src/CallTip.h \ -# ../include/Platform.h - -### end targets ### diff --git a/cocoa/SciTest.mk b/cocoa/SciTest.mk deleted file mode 100644 index 1cd075307..000000000 --- a/cocoa/SciTest.mk +++ /dev/null @@ -1,36 +0,0 @@ -### start defines ### -include common.mk - -NAME=Demo - -LD=gcc $(ARCH) -framework Cocoa - -TARG=$(APP)/Contents/MacOS/$(NAME) -APP=$(APP_BLD)/$(NAME).app - -all: $(APP_BLD) $(TARG) - -$(APP): - -rm -rf $(APP) - -mkdir $(APP) - -mkdir $(APP)/Contents/ - -mkdir $(APP)/Contents/Frameworks/ - -mkdir $(APP)/Contents/MacOS/ - -mkdir $(APP)/Contents/Resources/ - -cp ScintillaTest/Info.plist $(APP)/Contents/Info.plist.bak - -sed "s/\$${EXECUTABLE_NAME}/$(NAME)/g" < $(APP)/Contents/Info.plist.bak > $(APP)/Contents/Info.plist.bak2 - -sed "s/\$${PRODUCT_NAME}/$(NAME)/g" < $(APP)/Contents/Info.plist.bak2 > $(APP)/Contents/Info.plist - -rm $(APP)/Contents/Info.plist.bak $(APP)/Contents/Info.plist.bak2 - -cp -r ScintillaTest/English.lproj $(APP)/Contents/Resources/ - /Developer/usr/bin/ibtool --errors --warnings --notices --output-format human-readable-text \ - --compile $(APP)/Contents/Resources/English.lproj/MainMenu.nib ScintillaTest/English.lproj/MainMenu.xib - -cp ScintillaTest/TestData.sql $(APP)/Contents/Resources/ - -make -f Framework.mk all - -$(TARG) : $(APP_BLD)/main.o $(APP_BLD)/AppController.o $(APP) - -cp -R $(FRM_BLD)/Sci.framework $(APP)/Contents/Frameworks/ - $(LD) $(APP_BLD)/main.o $(APP_BLD)/AppController.o $(APP)/Contents/Frameworks/Sci.framework/Sci -o $(TARG) -lstdc++ - -$(APP_BLD) : - -mkdir $(BLD) - -mkdir $(APP_BLD) diff --git a/cocoa/checkbuildosx.sh b/cocoa/checkbuildosx.sh index f6b56328a..3ad1207f7 100755 --- a/cocoa/checkbuildosx.sh +++ b/cocoa/checkbuildosx.sh @@ -4,46 +4,37 @@ cd ../.. # ************************************************************ -# Target 1: build framework and test app with Xcode targetting OS X 10.7 +# Target 1: build framework and test app with Xcode targetting OS X 10.n with n from 9 to 5 +# Only SDK versions that are installed will be built # Clean both then build both -- if perform clean in ScintillaTest, also cleans ScintillaFramework # which can cause double build -cd scintilla/cocoa/ScintillaFramework -xcodebuild clean -cd ../ScintillaTest -xcodebuild clean -cd ../ScintillaFramework -xcodebuild -sdk macosx10.7 -cd ../ScintillaTest -xcodebuild -sdk macosx10.7 -cd ../../.. +echo Building Cocoa-native ScintillaFramework and ScintillaTest +for sdk in macosx10.9 macosx10.8 macosx10.7 macosx10.6 macosx10.5 +do + xcodebuild -showsdks | grep $sdk + if [ "$(xcodebuild -showsdks | grep $sdk)" != "" ] + then + echo Building with $sdk + cd scintilla/cocoa/ScintillaFramework + xcodebuild clean + cd ../ScintillaTest + xcodebuild clean + cd ../ScintillaFramework + xcodebuild -sdk $sdk + cd ../ScintillaTest + xcodebuild -sdk $sdk + cd ../../.. + else + echo Warning $sdk not available + fi +done # ************************************************************ -# Target 2: build framework and test app with Xcode targetting OS X 10.6 -cd scintilla/cocoa/ScintillaFramework -xcodebuild clean -cd ../ScintillaTest -xcodebuild clean -cd ../ScintillaFramework -xcodebuild -sdk macosx10.6 -cd ../ScintillaTest -xcodebuild -sdk macosx10.6 -cd ../../.. +# Target 2: Qt builds +# Requires Qt development libraries and qmake to be installed -# ************************************************************ -# Target 3: build framework and test app with Xcode targetting OS X 10.5 -cd scintilla/cocoa/ScintillaFramework -xcodebuild clean -cd ../ScintillaTest -xcodebuild clean -cd ../ScintillaFramework -xcodebuild -sdk macosx10.5 -cd ../ScintillaTest -xcodebuild -sdk macosx10.5 -cd ../../.. +echo Building Qt and PySide -# ************************************************************ -# Target 4: Qt builds -# Requires Qt development libraries and qmake to be installed cd scintilla/qt cd ScintillaEditBase qmake @@ -62,14 +53,3 @@ cd ScintillaEditPy python sepbuild.py cd .. cd ../.. - -# ************************************************************ -# Target 5: build framework and test app with make -cd scintilla/cocoa - -make -f Framework.mk clean -make -f Framework.mk all - -make -f SciTest.mk all - -cd ../.. diff --git a/cocoa/common.mk b/cocoa/common.mk deleted file mode 100644 index beb3b0f46..000000000 --- a/cocoa/common.mk +++ /dev/null @@ -1,57 +0,0 @@ -### shared variables and targets between Framework.mk and SciTest.mk ### - -# build directories -BLD=build -APP_BLD=$(BLD)/Application -FRM_BLD=$(BLD)/Framework - -ifdef DBG -CFLAGS=-g -O0 -else -CFLAGS=-Os -endif - -# compiler and compiler options -ARCH=-arch i386 $(CFLAGS) -CC=gcc -x c++ $(ARCH) -CO=gcc -x objective-c++ $(ARCH) -CCX=$(CC) $(gDEFs) $(INCS) -CCO=$(CO) $(gDEFs) $(INCS) - -# include directories and global #define -gDEFs=-DSCI_NAMESPACE -DSCI_LEXER - -# source directories -SRC_DIRS=../src ./ScintillaFramework ./ScintillaTest ./ \ - ../lexers ../lexlib - -INC_DIRS=$(SRC_DIRS) ../include - -INCS=$(addprefix -I,$(INC_DIRS)) - -vpath %.m $(SRC_DIRS) -vpath %.mm $(SRC_DIRS) -vpath %.cpp $(SRC_DIRS) -vpath %.cxx $(SRC_DIRS) -vpath %.c $(SRC_DIRS) -vpath %.h $(INC_DIRS) - -# clean everything -clean: - -rm -rf $(BLD) - -# build application objective-c++ files -$(APP_BLD)/%.o : %.mm - $(CCO) -c $< -o $@ - -# build application objective-c files -$(APP_BLD)/%.o : %.m - $(CCO) -c $< -o $@ - -# build framework c++ files -$(FRM_BLD)/%.o : %.cxx - $(CCX) -c $< -o $@ - -# build framework objective-c++ files -$(FRM_BLD)/%.o : %.mm - $(CCO) -c $< -o $@
\ No newline at end of file |