Hi,

I have a problem with TalkSoup. It is difficult to package, at the request of Sebastian I am trying to fix it.

Right now, it "copies" some stuff in the GNUstepOutput bundle from its Tools (two executables). It uses chown, etc. Sebastian can give further information if needed.

The bundle itself goes inside the App Bundle.

I need the "make" and "make install" phases to be separate. Fine. I think it is clean that the "Tools" are a separate sub-project copied into the bundle, that is what I did in the attached and proposed patch (sources are in GAP).

if you do "make && make install" everything is fine"

However, if you do "make install", the tools (dns_helper, etc) get not copied into the bundle.

I belive that for some reason, the bundle in which the tools need to be installed gets copied into the App bundle before the tools get copied into.

I need:

build:
1) App
2) Bundle
3) Tools

install
1) Tools into bundle
2) Bundles into App
3) install App bundle

Riccardo
? tool.patch
Index: Output/GNUstepOutput/GNUmakefile
===================================================================
RCS file: /sources/gap/gap/user-apps/TalkSoup/Output/GNUstepOutput/GNUmakefile,v
retrieving revision 1.5
diff -u -r1.5 GNUmakefile
--- Output/GNUstepOutput/GNUmakefile    21 Nov 2013 17:15:00 -0000      1.5
+++ Output/GNUstepOutput/GNUmakefile    24 Nov 2013 18:06:50 -0000
@@ -1,9 +1,10 @@
 include $(GNUSTEP_MAKEFILES)/common.make
 
+SUBPROJECTS = Tools
+
 BUNDLE_NAME = GNUstepOutput
 
 #BUNDLE_INSTALL_DIR = $(GNUSTEP_APPLICATION_SUPPORT)/TalkSoup/Output
-
 $(BUNDLE_NAME)_COPY_INTO_DIR = ../../Source/TalkSoup.app/Resources/Output
 
 Pref_Nibs = Preferences.nib \
@@ -56,7 +57,6 @@
 endif
 
 GNUstepOutput_RESOURCE_FILES += $(Extra_Resources)
-GNUstepOutput_RESOURCE_FILES += Tools/Tools
 
 GNUstepOutput_LANGUAGES = English
 
@@ -118,6 +118,9 @@
 GNUstepOutput_OBJC_FILES = GNUstepOutput.m $(Controllers) $(Views) $(Misc)\
                            $(Models)
 
+
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
+include $(GNUSTEP_MAKEFILES)/aggregate.make
+
 -include GNUmakefile.postamble
Index: Output/GNUstepOutput/GNUmakefile.postamble
===================================================================
RCS file: 
/sources/gap/gap/user-apps/TalkSoup/Output/GNUstepOutput/GNUmakefile.postamble,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile.postamble
--- Output/GNUstepOutput/GNUmakefile.postamble  13 Aug 2013 13:43:31 -0000      
1.3
+++ Output/GNUstepOutput/GNUmakefile.postamble  24 Nov 2013 18:06:50 -0000
@@ -6,8 +6,6 @@
        $(MKDIRS) $(GNUSTEP_OBJ_DIR)/Views
        $(MKDIRS) $(GNUSTEP_OBJ_DIR)/Misc
        $(MKDIRS) $(GNUSTEP_OBJ_DIR)/Models
-       $(MAKE) -C Tools all
-       $(MAKE) -C Tools install
 
 after-clean::
        $(MAKE) -C Tools clean
Index: Output/GNUstepOutput/Tools/GNUmakefile
===================================================================
RCS file: 
/sources/gap/gap/user-apps/TalkSoup/Output/GNUstepOutput/Tools/GNUmakefile,v
retrieving revision 1.3
diff -u -r1.3 GNUmakefile
--- Output/GNUstepOutput/Tools/GNUmakefile      13 Aug 2013 13:44:17 -0000      
1.3
+++ Output/GNUstepOutput/Tools/GNUmakefile      24 Nov 2013 18:06:50 -0000
@@ -1,7 +1,9 @@
 include $(GNUSTEP_MAKEFILES)/common.make
 
 TOOL_NAME = exec_helper dns_helper
-TOOL_INSTALL_DIR = Tools
+#TOOL_INSTALL_DIR = ../GNUstepOutput.bundle/Resources/Tools
+exec_helper_COPY_INTO_DIR = ../GNUstepOutput.bundle/Resources/Tools
+dns_helper_COPY_INTO_DIR = ../GNUstepOutput.bundle/Resources/Tools
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
 exec_helper_BUNDLE_LIBS = -framework TalkSoupBundles 
$(ADDITIONAL_FRAMEWORK_DIRS)
_______________________________________________
Discuss-gnustep mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/discuss-gnustep

Reply via email to