From 9a5f7b70bb608b27d7f6e864df3e8d975eeadc44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Thu, 28 Apr 2016 22:29:45 +0200 Subject: [PATCH] More introjucer -> projucer renaming --- debian/libbuilder/Makefile | 12 ++++++------ debian/patches/projucer-makegenerator.patch | 6 +++--- debian/{introjucer.install => projucer.install} | 0 debian/{introjucer.mime => projucer.mime} | 0 ...ojucer.sharedmimeinfo => projucer.sharedmimeinfo} | 0 debian/scripts/Projucer-help2man | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) rename debian/{introjucer.install => projucer.install} (100%) rename debian/{introjucer.mime => projucer.mime} (100%) rename debian/{introjucer.sharedmimeinfo => projucer.sharedmimeinfo} (100%) diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile index 2a6d68d1..18cdd0c0 100644 --- a/debian/libbuilder/Makefile +++ b/debian/libbuilder/Makefile @@ -14,7 +14,7 @@ empty= JUCE_PATH=../.. MODULES_PATH=$(JUCE_PATH)/modules DEMO_PATH = $(JUCE_PATH)/examples/Demo/Builds/Linux/ -INTROJUCER_PATH = $(JUCE_PATH)/extras/Projucer/Builds/LinuxMakefile/ +PROJUCER_PATH = $(JUCE_PATH)/extras/Projucer/Builds/LinuxMakefile/ SOURCES=juce_audio_basics.cpp \ juce_audio_devices.cpp \ @@ -114,9 +114,9 @@ JUCE_LDFLAGS += \ OBJECTS_RELEASE=$(SOURCES:%.cpp=$(OBJDIR_RELEASE)/%.o) OBJECTS_DEBUG=$(SOURCES:%.cpp=$(OBJDIR_DEBUG)/%.o) -.PHONY: all clean install install-lib-release install-lib-debug install-headers install-pkgconfig introjucer +.PHONY: all clean install install-lib-release install-lib-debug install-headers install-pkgconfig projucer -all: $(TARGET) introjucer +all: $(TARGET) projucer $(OBJDIR_RELEASE)/dir_stamp $(OBJDIR_DEBUG)/dir_stamp: @mkdir -p $(dir $@) @@ -143,7 +143,7 @@ $(OUTDIR)/libjuce_builddate.h: clean: @echo Cleaning JUCE rm -rf build - $(MAKE) -C $(INTROJUCER_PATH) clean + $(MAKE) -C $(PROJUCER_PATH) clean install-lib-release: $(OUTDIR)/$(TARGET_RELEASE) @echo Installing $(TARGET_RELEASE) @@ -173,8 +173,8 @@ install: install-headers install-lib-release install-lib-debug install-pkgconfig -include $(OBJECTS:%.o=%.d) -introjucer: $(OUTDIR)/$(TARGET_RELEASE) - $(MAKE) -C $(INTROJUCER_PATH) CONFIG=Release CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" +projucer: $(OUTDIR)/$(TARGET_RELEASE) + $(MAKE) -C $(PROJUCER_PATH) CONFIG=Release CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(OUTDIR)/juce-dbg.pc $(OUTDIR)/juce.pc: juce.pc.in sed \ diff --git a/debian/patches/projucer-makegenerator.patch b/debian/patches/projucer-makegenerator.patch index a3d13103..93092577 100644 --- a/debian/patches/projucer-makegenerator.patch +++ b/debian/patches/projucer-makegenerator.patch @@ -1,7 +1,7 @@ -Description: introjucer fixes - introjucer creates Linux Makefiles, but they do silent builds and do not allow +Description: projucer fixes + projucer creates Linux Makefiles, but they do silent builds and do not allow to override CPP/C/CXXFLAGS. - this patch changes introjucer to honor the "V" build variable, so "V=1" will + this patch changes projucer to honor the "V" build variable, so "V=1" will build verbosely. it also renames *FLAGS to JUCE_*FLAGS and appends the ordinary *FLAGS to them. . diff --git a/debian/introjucer.install b/debian/projucer.install similarity index 100% rename from debian/introjucer.install rename to debian/projucer.install diff --git a/debian/introjucer.mime b/debian/projucer.mime similarity index 100% rename from debian/introjucer.mime rename to debian/projucer.mime diff --git a/debian/introjucer.sharedmimeinfo b/debian/projucer.sharedmimeinfo similarity index 100% rename from debian/introjucer.sharedmimeinfo rename to debian/projucer.sharedmimeinfo diff --git a/debian/scripts/Projucer-help2man b/debian/scripts/Projucer-help2man index cfce4395..6e955d04 100755 --- a/debian/scripts/Projucer-help2man +++ b/debian/scripts/Projucer-help2man @@ -1,5 +1,5 @@ #!/bin/sh -INTROJUCER=$(pwd)/extras/Projucer/Builds/Linux/build/Projucer +PROJUCER=$(pwd)/extras/Projucer/Builds/Linux/build/Projucer LIBJUCE_PATH=$(pwd)/debian/libbuilder/build if [ -d "${LIBJUCE_PATH}" ]; then @@ -7,11 +7,11 @@ if [ -d "${LIBJUCE_PATH}" ]; then export LD_LIBRARY_PATH fi -#INTROJUCER=Projucer +#PROJUCER=Projucer case "$1" in -h|--help) - #${INTROJUCER} -h 2>/dev/null | sed -e 's|^ Projucer --| --|' + #${PROJUCER} -h 2>/dev/null | sed -e 's|^ Projucer --| --|' cat <