From 5e07243fa8a1dd45c40efc61cc9571a72227f789 Mon Sep 17 00:00:00 2001 From: Sergii Stoian Date: Mon, 14 Nov 2005 23:39:37 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@22011 72102866-910b-0410-8b05-ffd578937521 --- Documentation/ChangeLog | 8 +++++ GNUmakefile.postamble | 29 ++++++++++++++++++- GNUmakefile.preamble | 6 ++-- Library/GNUmakefile.postamble | 14 ++++----- Library/PCProject.h | 6 ---- Modules/AggregateProject/GNUmakefile | 2 +- Modules/AggregateProject/PCAggregateProj.m | 4 +-- Modules/AggregateProject/PCAggregateProject.m | 3 +- Modules/ApplicationProject/GNUmakefile | 2 +- Modules/ApplicationProject/PCAppProj.m | 6 ++-- Modules/BundleProject/GNUmakefile | 4 +-- Modules/BundleProject/PCBundleProj.m | 2 +- Modules/BundleProject/PCBundleProject.m | 6 ++-- Modules/GNUmakefile.bundles | 12 ++++++++ Modules/LibraryProject/GNUmakefile | 2 +- Modules/LibraryProject/PCLibProj.m | 2 +- Modules/RenaissanceProject/GNUmakefile | 3 +- .../RenaissanceProject/PCRenaissanceProj.m | 4 +-- Modules/ToolProject/GNUmakefile | 6 ---- Modules/ToolProject/PCToolProj.m | 4 +-- Modules/ToolProject/PCToolProject.m | 4 +-- PCAppController.m | 2 +- PCInfoController.m | 2 +- PCMenuController.m | 2 +- PCPrefController.m | 2 +- 25 files changed, 85 insertions(+), 52 deletions(-) diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog index 7c02328..c81b063 100644 --- a/Documentation/ChangeLog +++ b/Documentation/ChangeLog @@ -1,3 +1,11 @@ +2005-11-10 Adam Fedor + + * GNUmakefile.postamble: Add some hacks to copy header files on + Windows machines. + * GNUmakefile.preamble: Correct libs + * Library/GNUmakefile.postamble: Don't make dir links + * Modules/GNUmakefile.bundles: Add bundle libs on Windows. + 2005-07-03 Serg Stoyan * Library/PCButton: (mouseMoved:) check if ttWindow is not nil. diff --git a/GNUmakefile.postamble b/GNUmakefile.postamble index 88d7953..ac914ab 100644 --- a/GNUmakefile.postamble +++ b/GNUmakefile.postamble @@ -22,8 +22,35 @@ # If not, write to the Free Software Foundation, # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -before-all:: +HEADER_LINK_DEPENDS=link-setup + +before-all:: header-links after-clean:: + rm -rf ProjectCenter $(HEADER_LINK_DEPENDS) after-uninstall:: + +# FIXME: Temporary solution to Library being in the wrong place - we really +# should just move the directory in CVS +DO_HEADER_LINKS=no +ifeq ($(GNUSTEP_TARGET_OS), mingw32) + DO_HEADER_LINKS=yes +endif +ifeq ($(GNUSTEP_TARGET_OS), cygwin) + DO_HEADER_LINKS=yes +endif +ifeq ($(DO_HEADER_LINKS), yes) +header-links: $(HEADER_LINK_DEPENDS) + -rm -rf ProjectCenter + -mkdir ProjectCenter + cp -f Library/*.h ProjectCenter +else +header-links: $(HEADER_LINK_DEPENDS) + -rm -f ProjectCenter + $(LN_S) Library ProjectCenter +endif + +$(HEADER_LINK_DEPENDS): + touch $(HEADER_LINK_DEPENDS) + diff --git a/GNUmakefile.preamble b/GNUmakefile.preamble index d9330cb..f8a9240 100644 --- a/GNUmakefile.preamble +++ b/GNUmakefile.preamble @@ -41,12 +41,14 @@ ADDITIONAL_CFLAGS += ADDITIONAL_INCLUDE_DIRS += -I./ # Additional LDFLAGS to pass to the linker -ADDITIONAL_LDFLAGS += -lProjectCenter +ADDITIONAL_LDFLAGS += # Additional library directories the linker should search -#ADDITIONAL_LIB_DIRS += -L./Library/$(GNUSTEP_OBJ_DIR) ADDITIONAL_LIB_DIRS += -L./Library/ProjectCenter.framework/Versions/Current +# Additional LDFLAGS to pass to the linker +ADDITIONAL_GUI_LIBS += -lProjectCenter + # # Flags dealing with installing and uninstalling # diff --git a/Library/GNUmakefile.postamble b/Library/GNUmakefile.postamble index fce9554..6a9bb3f 100644 --- a/Library/GNUmakefile.postamble +++ b/Library/GNUmakefile.postamble @@ -22,14 +22,12 @@ # If not, write to the Free Software Foundation, # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -before-all:: - cd ..;rm -f ProjectCenter;$(LN_S) Library ProjectCenter +#before-all:: +# cd ..;rm -f ProjectCenter;$(LN_S) Library ProjectCenter -after-clean:: - rm -f ../ProjectCenter +#after-clean:: +# rm -f ../ProjectCenter -after-uninstall:: -# rm -rf $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/ProjectCenter -# rm -rf $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/Resources/ProjectCenter - rm -rf $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/libProjectCenter* +#after-uninstall:: +# rm -rf $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/libProjectCenter* diff --git a/Library/PCProject.h b/Library/PCProject.h index 6759626..899f423 100644 --- a/Library/PCProject.h +++ b/Library/PCProject.h @@ -40,12 +40,6 @@ @class PCProjectLauncher; @class PCProjectEditor; -/*#ifndef GNUSTEP_BASE_VERSION -@protocol ProjectBuilder; -#else -#include -#endif*/ - extern NSString *PCProjectDictDidChangeNotification; extern NSString *PCProjectDictDidSaveNotification; diff --git a/Modules/AggregateProject/GNUmakefile b/Modules/AggregateProject/GNUmakefile index eacbad8..3bd80b5 100644 --- a/Modules/AggregateProject/GNUmakefile +++ b/Modules/AggregateProject/GNUmakefile @@ -14,7 +14,7 @@ AggregateProject_PRINCIPAL_CLASS = PCAggregateProj # # Additional libraries # -AggregateProject_LIBRARIES_DEPEND_UPON += -lProjectCenter +AggregateProject_LIBRARIES_DEPEND_UPON += # # Resource files diff --git a/Modules/AggregateProject/PCAggregateProj.m b/Modules/AggregateProject/PCAggregateProj.m index ee01c16..25d3e1b 100644 --- a/Modules/AggregateProject/PCAggregateProj.m +++ b/Modules/AggregateProject/PCAggregateProj.m @@ -22,8 +22,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include "ProjectCenter/PCFileCreator.h" -#include "ProjectCenter/PCMakefileFactory.h" +#include +#include #include "PCAggregateProj.h" #include "PCAggregateProject.h" diff --git a/Modules/AggregateProject/PCAggregateProject.m b/Modules/AggregateProject/PCAggregateProject.m index 60cf23b..92d6058 100644 --- a/Modules/AggregateProject/PCAggregateProject.m +++ b/Modules/AggregateProject/PCAggregateProject.m @@ -22,10 +22,11 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ +#include + #include "PCAggregateProject.h" #include "PCAggregateProj.h" -#include @implementation PCAggregateProject diff --git a/Modules/ApplicationProject/GNUmakefile b/Modules/ApplicationProject/GNUmakefile index 7261c95..8c0a833 100644 --- a/Modules/ApplicationProject/GNUmakefile +++ b/Modules/ApplicationProject/GNUmakefile @@ -17,7 +17,7 @@ ApplicationProject_PRINCIPAL_CLASS = PCAppProj # # Additional libraries # -#ApplicationProject_LIBRARIES_DEPEND_UPON += -lProjectCenter +ApplicationProject_LIBRARIES_DEPEND_UPON += # # Resource files diff --git a/Modules/ApplicationProject/PCAppProj.m b/Modules/ApplicationProject/PCAppProj.m index 7afacf0..aa03fc8 100644 --- a/Modules/ApplicationProject/PCAppProj.m +++ b/Modules/ApplicationProject/PCAppProj.m @@ -25,9 +25,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include "ProjectCenter/PCFileCreator.h" -#include "ProjectCenter/PCFileManager.h" -#include "ProjectCenter/PCMakefileFactory.h" +#include +#include +#include #include "PCAppProj.h" #include "PCAppProject.h" diff --git a/Modules/BundleProject/GNUmakefile b/Modules/BundleProject/GNUmakefile index ff8eadd..fc7ed08 100644 --- a/Modules/BundleProject/GNUmakefile +++ b/Modules/BundleProject/GNUmakefile @@ -21,7 +21,7 @@ BundleProject_PRINCIPAL_CLASS = PCBundleProj # # Additional libraries # -BundleProject_LIBRARIES_DEPEND_UPON += -lProjectCenter +BundleProject_LIBRARIES_DEPEND_UPON += # # Resource files @@ -29,8 +29,6 @@ BundleProject_LIBRARIES_DEPEND_UPON += -lProjectCenter BundleProject_RESOURCE_FILES = \ Resources/PC.project \ Resources/Inspector.gorm -#Resources/class.template \ -#Resources/header.template # # Header files diff --git a/Modules/BundleProject/PCBundleProj.m b/Modules/BundleProject/PCBundleProj.m index 3d65617..f7b57c2 100644 --- a/Modules/BundleProject/PCBundleProj.m +++ b/Modules/BundleProject/PCBundleProj.m @@ -26,7 +26,7 @@ */ #include -#include "ProjectCenter/PCMakefileFactory.h" +#include #include "PCBundleProj.h" #include "PCBundleProject.h" diff --git a/Modules/BundleProject/PCBundleProject.m b/Modules/BundleProject/PCBundleProject.m index 437d8dc..b459bec 100644 --- a/Modules/BundleProject/PCBundleProject.m +++ b/Modules/BundleProject/PCBundleProject.m @@ -23,12 +23,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include "PCBundleProj.h" -#include "PCBundleProject.h" - #include #include +#include "PCBundleProj.h" +#include "PCBundleProject.h" + @implementation PCBundleProject //---------------------------------------------------------------------------- diff --git a/Modules/GNUmakefile.bundles b/Modules/GNUmakefile.bundles index 0488c45..dbc174e 100644 --- a/Modules/GNUmakefile.bundles +++ b/Modules/GNUmakefile.bundles @@ -7,6 +7,18 @@ ADDITIONAL_CPPFLAGS += ADDITIONAL_INCLUDE_DIRS += -I../.. ADDITIONAL_LIB_DIRS += -L../../Library/$(GNUSTEP_OBJ_DIR) +DO_LIB_LINK=no +ifeq ($(GNUSTEP_TARGET_OS), mingw32) + DO_LIB_LINK=yes +endif +ifeq ($(GNUSTEP_TARGET_OS), cygwin) + DO_LIB_LINK=yes +endif +ifeq ($(DO_LIB_LINK), yes) + $(GNUSTEP_INSTANCE)_LIB_DIRS += -L../../Library/ProjectCenter.framework + $(GNUSTEP_INSTANCE)_BUNDLE_LIBS += -lProjectCenter +endif + BUNDLE_EXTENSION = .bundle BUNDLE_INSTALL_DIR = $(GNUSTEP_SYSTEM_ROOT)/Applications/ProjectCenter.app/Resources $(PACKAGE_NAME)_STANDARD_INSTALL = no diff --git a/Modules/LibraryProject/GNUmakefile b/Modules/LibraryProject/GNUmakefile index 30ffbf7..36140b2 100644 --- a/Modules/LibraryProject/GNUmakefile +++ b/Modules/LibraryProject/GNUmakefile @@ -24,7 +24,7 @@ LibraryProject_PRINCIPAL_CLASS = PCLibProj # Additional libraries # -LibraryProject_LIBRARIES_DEPEND_UPON += -lProjectCenter +LibraryProject_LIBRARIES_DEPEND_UPON += # # Resource files diff --git a/Modules/LibraryProject/PCLibProj.m b/Modules/LibraryProject/PCLibProj.m index 778f2b3..a22024b 100644 --- a/Modules/LibraryProject/PCLibProj.m +++ b/Modules/LibraryProject/PCLibProj.m @@ -26,7 +26,7 @@ */ #include -#include "ProjectCenter/PCMakefileFactory.h" +#include #include "PCLibProj.h" #include "PCLibProject.h" diff --git a/Modules/RenaissanceProject/GNUmakefile b/Modules/RenaissanceProject/GNUmakefile index a3b1356..341c6fb 100644 --- a/Modules/RenaissanceProject/GNUmakefile +++ b/Modules/RenaissanceProject/GNUmakefile @@ -22,8 +22,7 @@ RenaissanceProject_PRINCIPAL_CLASS = PCRenaissanceProj # # Additional libraries # - -RenaissanceProject_LIBRARIES_DEPEND_UPON += -lProjectCenter +RenaissanceProject_LIBRARIES_DEPEND_UPON += # # Resource files diff --git a/Modules/RenaissanceProject/PCRenaissanceProj.m b/Modules/RenaissanceProject/PCRenaissanceProj.m index 2e21691..46c0c1c 100644 --- a/Modules/RenaissanceProject/PCRenaissanceProj.m +++ b/Modules/RenaissanceProject/PCRenaissanceProj.m @@ -27,8 +27,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include "ProjectCenter/PCFileCreator.h" -#include "ProjectCenter/PCMakefileFactory.h" +#include +#include #include "PCRenaissanceProj.h" #include "PCRenaissanceProject.h" diff --git a/Modules/ToolProject/GNUmakefile b/Modules/ToolProject/GNUmakefile index cd0eebc..5dbb6f0 100644 --- a/Modules/ToolProject/GNUmakefile +++ b/Modules/ToolProject/GNUmakefile @@ -14,7 +14,6 @@ include $(GNUSTEP_MAKEFILES)/common.make # # Bundle # - PACKAGE_NAME = ToolProject BUNDLE_NAME = ToolProject ToolProject_PRINCIPAL_CLASS = PCToolProj @@ -23,13 +22,11 @@ ToolProject_PRINCIPAL_CLASS = PCToolProj # # Additional libraries # - ToolProject_LIBRARIES_DEPEND_UPON += -lProjectCenter # # Resource files # - ToolProject_RESOURCE_FILES= \ Resources/PC.project \ Resources/main.m \ @@ -38,7 +35,6 @@ Resources/Inspector.gorm # # Header files # - ToolProject_HEADERS= \ PCToolProj.h \ PCToolProject.h @@ -46,7 +42,6 @@ PCToolProject.h # # Class files # - ToolProject_OBJC_FILES= \ PCToolProj.m \ PCToolProject.m @@ -54,7 +49,6 @@ PCToolProject.m # # C files # - ToolProject_C_FILES= include ../GNUmakefile.bundles diff --git a/Modules/ToolProject/PCToolProj.m b/Modules/ToolProject/PCToolProj.m index 08a1266..b10225a 100644 --- a/Modules/ToolProject/PCToolProj.m +++ b/Modules/ToolProject/PCToolProj.m @@ -25,8 +25,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include "ProjectCenter/PCFileCreator.h" -#include "ProjectCenter/PCMakefileFactory.h" +#include +#include #include "PCToolProj.h" #include "PCToolProject.h" diff --git a/Modules/ToolProject/PCToolProject.m b/Modules/ToolProject/PCToolProject.m index 8f0522e..4f9865a 100644 --- a/Modules/ToolProject/PCToolProject.m +++ b/Modules/ToolProject/PCToolProject.m @@ -23,11 +23,11 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ +#include + #include "PCToolProject.h" #include "PCToolProj.h" -#include - @implementation PCToolProject //---------------------------------------------------------------------------- diff --git a/PCAppController.m b/PCAppController.m index 13f0682..af6dd44 100644 --- a/PCAppController.m +++ b/PCAppController.m @@ -29,7 +29,7 @@ #include "PCPrefController.h" #include "PCLogController.h" -#include +#include "Library/ProjectCenter.h" @implementation PCAppController diff --git a/PCInfoController.m b/PCInfoController.m index f09a35c..c4559aa 100644 --- a/PCInfoController.m +++ b/PCInfoController.m @@ -24,7 +24,7 @@ */ #include "PCInfoController.h" -#include +#include "Library/ProjectCenter.h" @implementation PCInfoController diff --git a/PCMenuController.m b/PCMenuController.m index 7b1f28b..adc1191 100644 --- a/PCMenuController.m +++ b/PCMenuController.m @@ -28,7 +28,7 @@ #include "PCInfoController.h" #include "PCPrefController.h" #include "PCLogController.h" -#include +#include "Library/ProjectCenter.h" @implementation PCMenuController diff --git a/PCPrefController.m b/PCPrefController.m index 36f03ec..9417b22 100644 --- a/PCPrefController.m +++ b/PCPrefController.m @@ -24,7 +24,7 @@ */ #include "PCPrefController.h" -#include +#include "Library/ProjectCenter.h" #include "PCLogController.h"