gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-04-23 06:20:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update makefiles, move prefs, fix issue with Prefs image

Browse source
This commit is contained in:
Gregory John Casamento 2023-06-14 07:15:20 -04:00
parent 8122f26594
commit 2ec33abd2e
33 changed files with 29 additions and 236 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Applications/Gorm/GNUmakefile
View file

@ -56,7 +56,6 @@ include ./Version
# Each palette is a subproject
#
SUBPROJECTS = \
GormPrefs \
Palettes
#

3
Applications/Gorm/GNUmakefile.preamble
View file

@ -28,18 +28,15 @@ ADDITIONAL_GUI_LIBS += \
-lInterfaceBuilder \
-lGormCore \
-lGormObjCHeaderParser \
-lGormPrefs
ADDITIONAL_INCLUDE_DIRS += \
-I../../InterfaceBuilder \
-I../../GormObjCHeaderParser \
-I../../GormCore \
-I../.. \
-IGormPrefs \
-I.
ADDITIONAL_LIB_DIRS += \
-L../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/GormCore.framework \
-LGormPrefs/$(GNUSTEP_OBJ_DIR)

92
Applications/Gorm/GormPrefs/GNUmakefile
View file

@ -1,92 +0,0 @@
#
# GNUmakefile
# Written by Gregory John Casamento <greg_casamento@yahoo.com>
#
PACKAGE_NAME = gorm
include $(GNUSTEP_MAKEFILES)/common.make
#
# Subprojects
#
#
# Framework
#
PACKAGE_NAME=GormPrefs
LIBRARY_VAR=GORMPREFS
LIBRARY_NAME=GormPrefs
GormPrefs_HEADER_FILES_DIR=.
GormPrefs_HEADER_FILES_INSTALL_DIR=/GormPrefs
ADDITIONAL_INCLUDE_DIRS = -I../../..
srcdir = .
#
# Additional libraries
#
GormPrefs_LIBRARIES_DEPEND_UPON += -lgnustep-gui -l$(FOUNDATION_LIBRARY_NAME)
#
# Header files
#
GormPrefs_HEADER_FILES= \
GormPrefs.h \
GormGeneralPref.h \
GormGuidelinePref.h \
GormHeadersPref.h \
GormPalettesPref.h \
GormPluginsPref.h \
GormPrefController.h \
GormShelfPref.h
#
# Class files
#
GormPrefs_OBJC_FILES= \
GormGeneralPref.m \
GormGuidelinePref.m \
GormHeadersPref.m \
GormPalettesPref.m \
GormPluginsPref.m \
GormPrefController.m \
GormShelfPref.m
#
# Resources
#
#GormPrefs_LOCALIZED_RESOURCE_FILES= \
#GormPrefColors.gorm \
#GormPreferences.gorm \
#GormPrefGeneral.gorm \
#GormPrefGuideline.gorm \
#GormPrefHeaders.gorm \
#GormPrefPalettes.gorm \
#GormShelfPref.gorm
#
# Languages
#
#GormPrefs_LANGUAGES= \
#English
#
# C files
#
GormPrefs_C_FILES=
HEADERS_INSTALL = $(GormPrefs_HEADER_FILES)
-include GNUmakefile.preamble
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/library.make
-include GNUmakefile.postamble

32
Applications/Gorm/GormPrefs/GNUmakefile.preamble
View file

@ -1,32 +0,0 @@
# GNUmakefile: main makefile for GNUstep Object Relationship Modeller
#
# Copyright (C) 2003 Free Software Foundation, Inc.
#
# Author: Gregory John Casamento <greg_casamento@yahoo.com>
# Date: 2003
#
# This file is part of GNUstep.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
#
# ADDITIONAL_OBJCFLAGS += -Wall -Werror
ADDITIONAL_GUI_LIBS += \
-lGormCore \
-lInterfaceBuilder
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)

2
Applications/Gorm/Palettes/0Menus/GNUmakefile.preamble
View file

@ -5,7 +5,6 @@ ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework
ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
@ -14,7 +13,6 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework
$(PALETTE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore

2
Applications/Gorm/Palettes/1Windows/GNUmakefile.preamble
View file

@ -5,7 +5,6 @@ ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework
ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
@ -14,7 +13,6 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework
$(PALETTE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore

2
Applications/Gorm/Palettes/2Controls/GNUmakefile.preamble
View file

@ -5,7 +5,6 @@ ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework
ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
@ -14,7 +13,6 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework
$(PALETTE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore

2
Applications/Gorm/Palettes/3Containers/GNUmakefile.preamble
View file

@ -5,7 +5,6 @@ ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework
ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
@ -14,7 +13,6 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework
$(PALETTE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore

2
Applications/Gorm/Palettes/4Data/GNUmakefile.preamble
View file

@ -5,7 +5,6 @@ ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework
ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
@ -14,7 +13,6 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework
$(PALETTE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore

19
GormCore/GNUmakefile
View file

@ -103,7 +103,15 @@ GormCore_HEADER_FILES = \
NSCell+GormAdditions.h \
NSColorWell+GormExtensions.h \
NSFontManager+GormExtensions.h \
NSView+GormExtensions.h
NSView+GormExtensions.h \
GormGeneralPref.h \
GormGuidelinePref.h \
GormHeadersPref.h \
GormPalettesPref.h \
GormPluginsPref.h \
GormPrefController.h \
GormPrefs.h \
GormShelfPref.h \
GormCore_OBJC_FILES = \
GormBoxEditor.m \
@ -166,7 +174,14 @@ GormCore_OBJC_FILES = \
NSColorWell+GormExtensions.m \
NSFontManager+GormExtensions.m \
NSView+GormExtensions.m \
GormPrivate.m
GormPrivate.m \
GormGeneralPref.m \
GormGuidelinePref.m \
GormHeadersPref.m \
GormPalettesPref.m \
GormPluginsPref.m \
GormPrefController.m \
GormShelfPref.m \
GormCore_RESOURCE_FILES = \
Plugins/Gorm/Gorm.plugin \

2
GormCore/GormDocument.m
View file

@ -167,7 +167,7 @@ static NSImage *fileImage = nil;
{
classesImage = [[NSImage alloc] initWithContentsOfFile: path];
}
path = [bundle pathForImageResource: @"Gorm"];
path = [bundle pathForImageResource: @"GormFile"];
if (path != nil)
{
fileImage = [[NSImage alloc] initWithContentsOfFile: path];

0
Applications/Gorm/GormPrefs/GormGeneralPref.h → GormCore/GormGeneralPref.h
View file

0
Applications/Gorm/GormPrefs/GormGeneralPref.m → GormCore/GormGeneralPref.m
View file

0
Applications/Gorm/GormPrefs/GormGuidelinePref.h → GormCore/GormGuidelinePref.h
View file

0
Applications/Gorm/GormPrefs/GormGuidelinePref.m → GormCore/GormGuidelinePref.m
View file

0
Applications/Gorm/GormPrefs/GormHeadersPref.h → GormCore/GormHeadersPref.h
View file

0
Applications/Gorm/GormPrefs/GormHeadersPref.m → GormCore/GormHeadersPref.m
View file

0
Applications/Gorm/GormPrefs/GormPalettesPref.h → GormCore/GormPalettesPref.h
View file

0
Applications/Gorm/GormPrefs/GormPalettesPref.m → GormCore/GormPalettesPref.m
View file

0
Applications/Gorm/GormPrefs/GormPluginsPref.h → GormCore/GormPluginsPref.h
View file

0
Applications/Gorm/GormPrefs/GormPluginsPref.m → GormCore/GormPluginsPref.m
View file

0
Applications/Gorm/GormPrefs/GormPrefController.h → GormCore/GormPrefController.h
View file

0
Applications/Gorm/GormPrefs/GormPrefController.m → GormCore/GormPrefController.m
View file

14
Applications/Gorm/GormPrefs/GormPrefs.h → GormCore/GormPrefs.h
View file

@ -35,12 +35,12 @@ FOUNDATION_EXPORT const unsigned char GormPrefsVersionString[];
#ifndef INCLUDED_GORMPREFS_H
#define INCLUDED_GORMPREFS_H
#include <GormPrefs/GormGeneralPref.h>
#include <GormPrefs/GormGuidelinePref.h>
#include <GormPrefs/GormHeadersPref.h>
#include <GormPrefs/GormPalettesPref.h>
#include <GormPrefs/GormPluginsPref.h>
#include <GormPrefs/GormPrefController.h>
#include <GormPrefs/GormShelfPref.h>
#include <GormCore/GormGeneralPref.h>
#include <GormCore/GormGuidelinePref.h>
#include <GormCore/GormHeadersPref.h>
#include <GormCore/GormPalettesPref.h>
#include <GormCore/GormPluginsPref.h>
#include <GormCore/GormPrefController.h>
#include <GormCore/GormShelfPref.h>
#endif

0
Applications/Gorm/GormPrefs/GormShelfPref.h → GormCore/GormShelfPref.h
View file

0
Applications/Gorm/GormPrefs/GormShelfPref.m → GormCore/GormShelfPref.m
View file

4
GormCore/Plugins/GModel/GNUmakefile.preamble
View file

@ -5,7 +5,6 @@ ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
@ -14,8 +13,7 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
GModel_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
endif

41
GormCore/Plugins/GNUmakefile.postamble
View file

@ -1,41 +0,0 @@
#
# GNUmakefile.postamble
#
# Copyright (C) 2003 Free Software Foundation, Inc.
#
# Author: Gregory John Casamento <greg_casamento@yahoo.com>
#
# This file is part of GNUstep
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Library General Public License for more details.
#
# You should have received a copy of the GNU Library General Public
# License along with this library; see the file COPYING.LIB.
# If not, write to the Free Software Foundation,
# 51 Franklin Street, Fifth Floor, Boston, MA 02111
# USA.
#
# Define this variable if not defined for backwards-compatibility as
# it is only available in gnustep-make >= 2.0.5
ifeq ($(LN_S_RECURSIVE),)
LN_S_RECURSIVE = $(LN_S)
endif
before-all::
after-all::
after-clean::
after-distclean::
after-clean::

33
GormCore/Plugins/GNUmakefile.preamble
View file

@ -1,33 +0,0 @@
#
# Copyright (C) 2003 Free Software Foundation, Inc.
#
# Author: Gregory John Casamento <greg,casamento@gmail.com>
# Date: 2023
#
# This file is part of GNUstep.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111
# USA.
#
ADDITIONAL_INCLUDE_DIRS += \
-I../../ \
-I../
ADDITIONAL_LIB_DIRS += \
-L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/$(GNUSTEP_OBJ_DIR)

4
GormCore/Plugins/Gorm/GNUmakefile.preamble
View file

@ -5,7 +5,6 @@ ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
@ -14,8 +13,7 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
Gorm_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
endif

4
GormCore/Plugins/Nib/GNUmakefile.preamble
View file

@ -5,7 +5,6 @@ ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
@ -14,8 +13,7 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
Nib_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
endif

4
GormCore/Plugins/Xib/GNUmakefile.preamble
View file

@ -5,7 +5,6 @@ ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
@ -14,8 +13,7 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
Nib_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
endif

2
Tools/gormtool/GNUmakefile.preamble
View file

@ -27,7 +27,6 @@ ADDITIONAL_TOOL_LIBS += \
-lGormCore \
-lInterfaceBuilder \
-lGormObjCHeaderParser \
-lGormPrefs \
-lgnustep-base \
-lgnustep-gui
@ -37,5 +36,4 @@ ADDITIONAL_INCLUDE_DIRS += \
ADDITIONAL_LIB_DIRS += \
-L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/GormCore.framework