Re: GNUstep filesystem spec

[Dennis Leeuw]

Adam Fedor wrote:

> I've added a documentation about the GNUstep filesystem layout, based on
>   some documentation written by the LinuxStep.org crew, on CVS at
>
> make/Documentation/filesystem.texi
>
> and also in the documentation page at:
>
> http://www.gnustep.org/resources/documentation/filesystem.ps
>
> If you don't like the way things are set-up, speak now as it will be
> much more difficult to change later. Don't expect GNUstep to follow this
> document any time soon. All us developers have lots of interesting
> things to do before we'll get around to changing the libraries to work
> with the new layout.

Okay, so you need a hand ;)

Here is some diffs, all in seperate files for DTDs, Palettes and Headers.

I split them up, so bug hunting would be easier.

Hope it helps.

Dennis


>
>
> --
> Adam Fedor, Digital Optics Corp.      | I'm glad I hate spinach, because
> http://www.doc.com                    | if I didn't, I'd eat it, and you
>                                        | know how I hate the stuff.
>
> _______________________________________________
> Discuss-gnustep mailing list
> Discuss-gnustep@gnu.org
> http://mail.gnu.org/mailman/listinfo/discuss-gnustep

diff -r core/base/Tools/gsdoc.gsdoc core-20021003/base/Tools/gsdoc.gsdoc
641c641
<   "/usr/GNUstep/System/Libraries/Resources/DTDs/gsdoc-0_6_6.dtd" \
---
>   "/usr/GNUstep/System/Library/DTDs/gsdoc-0_6_6.dtd" \
diff -r core/base/Tools/indextemplate.gsdoc 
core-20021003/base/Tools/indextemplate.gsdoc
2c2
< <!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 0.6.6//EN" 
"/usr/GNUstep/System/Libraries/Resources/DTDs/gsdoc-0_6_6.dtd">
---
> <!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 0.6.6//EN" 
> "/usr/GNUstep/System/Library/DTDs/gsdoc-0_6_6.dtd">
diff -r core/gui/Documentation/Gui/DefaultsSummary.gsdoc 
core-20021003/gui/Documentation/Gui/DefaultsSummary.gsdoc
2c2
< <!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 0.6.7//EN" 
"/usr/GNUstep/System/Libraries/Resources/DTDs/gsdoc-0_6_6.dtd" >
---
> <!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 0.6.7//EN" 
> "/usr/GNUstep/System/Library/DTDs/gsdoc-0_6_6.dtd" >
diff -r core/gui/Documentation/Gui/LanguageSetup.gsdoc 
core-20021003/gui/Documentation/Gui/LanguageSetup.gsdoc
2c2
< <!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 0.6.7//EN" 
"/usr/GNUstep/System/Libraries/Resources/DTDs/gsdoc-0_6_6.dtd" >
---
> <!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 0.6.7//EN" 
> "/usr/GNUstep/System/Library/DTDs/gsdoc-0_6_6.dtd" >

50c50
< GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
---
> GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers

44c44
< GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
---
> GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers

104c104
< GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
---
> GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers

49c49
< GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
---
> GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers

204c204
<     cp include/iconv.h $GNUSTEP_SYSTEM_ROOT/Headers
---
>     cp include/iconv.h $GNUSTEP_SYSTEM_ROOT/Library/Headers
218c218
<   the header (.h) files in $GNUSTEP_SYSTEM_ROOT/Headers
---
>   the header (.h) files in $GNUSTEP_SYSTEM_ROOT/Library/Headers
237c237
<     tar -cf - libxml | (cd $GNUSTEP_SYSTEM_ROOT/Headers; tar -xvf -)
---
>     tar -cf - libxml | (cd $GNUSTEP_SYSTEM_ROOT/Library/Headers; tar -xvf -)
249c249
<     tar -cf - openssl | (cd $GNUSTEP_SYSTEM_ROOT/Headers; tar -xvf -)
---
>     tar -cf - openssl | (cd $GNUSTEP_SYSTEM_ROOT/Library/Headers; tar -xvf -)

259c259
< GNUSTEP_HDIR="$prefix/Headers"
---
> GNUSTEP_HDIR="$prefix/Library/Headers"
292c292
<   OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Headers"
---
>   OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Library/Headers"

133d132
<               $(GNUSTEP_SYSTEM_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \
138a138,139
>               $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
>               $(GNUSTEP_SYSTEM_ROOT)/Library/Palettes \
145d145
<               $(GNUSTEP_SYSTEM_ROOT)/Developer/Palettes \
150d149
<               $(GNUSTEP_LOCAL_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \
155a155,156
>               $(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
>               $(GNUSTEP_LOCAL_ROOT)/Library/Palettes \
160d160
<               $(GNUSTEP_LOCAL_ROOT)/Developer/Palettes \

138a139
>               $(GNUSTEP_SYSTEM_ROOT)/Library/Palettes \
145d145
<               $(GNUSTEP_SYSTEM_ROOT)/Developer/Palettes \
155a156
>               $(GNUSTEP_LOCAL_ROOT)/Library/Palettes \
160d160
<               $(GNUSTEP_LOCAL_ROOT)/Developer/Palettes \

138a139
>               $(GNUSTEP_SYSTEM_ROOT)/Library/Palettes \
145d145
<               $(GNUSTEP_SYSTEM_ROOT)/Developer/Palettes \
155a156
>               $(GNUSTEP_LOCAL_ROOT)/Library/Palettes \
160d160
<               $(GNUSTEP_LOCAL_ROOT)/Developer/Palettes \

187d186
< GNUSTEP_HEADERS              = $(GNUSTEP_INSTALLATION_DIR)/Headers
189a189
> GNUSTEP_HEADERS              = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers
209,216c209,216
<   $(GNUSTEP_USER_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \
<   $(GNUSTEP_USER_ROOT)/Headers \
<   $(GNUSTEP_LOCAL_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \
<   $(GNUSTEP_LOCAL_ROOT)/Headers \
<   $(GNUSTEP_NETWORK_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \
<   $(GNUSTEP_NETWORK_ROOT)/Headers \
<   $(GNUSTEP_SYSTEM_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \
<   $(GNUSTEP_SYSTEM_ROOT)/Headers
---
>   $(GNUSTEP_USER_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
>   $(GNUSTEP_USER_ROOT)/Library/Headers \
>   $(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
>   $(GNUSTEP_LOCAL_ROOT)/Library/Headers \
>   $(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
>   $(GNUSTEP_NETWORK_ROOT)/Library/Headers \
>   $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
>   $(GNUSTEP_SYSTEM_ROOT)/Library/Headers
231,234c231,234
<   $(GNUSTEP_USER_ROOT)/Headers \
<   $(GNUSTEP_LOCAL_ROOT)/Headers \
<   $(GNUSTEP_NETWORK_ROOT)/Headers \
<   $(GNUSTEP_SYSTEM_ROOT)/Headers
---
>   $(GNUSTEP_USER_ROOT)/Library/Headers \
>   $(GNUSTEP_LOCAL_ROOT)/Library/Headers \
>   $(GNUSTEP_NETWORK_ROOT)/Library/Headers \
>   $(GNUSTEP_SYSTEM_ROOT)/Library/Headers
308,311c308,311
<   $(GNUSTEP_USER_ROOT)/Headers/$(GNUSTEP_FND_DIR) \
<   $(GNUSTEP_LOCAL_ROOT)/Headers/$(GNUSTEP_FND_DIR) \
<   $(GNUSTEP_NETWORK_ROOT)/Headers/$(GNUSTEP_FND_DIR) \
<   $(GNUSTEP_SYSTEM_ROOT)/Headers/$(GNUSTEP_FND_DIR)
---
>   $(GNUSTEP_USER_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR) \
>   $(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR) \
>   $(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR) \
>   $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR)
315,318c315,318
<     
$(GNUSTEP_USER_ROOT)/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
 \
<     
$(GNUSTEP_LOCAL_ROOT)/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
 \
<     
$(GNUSTEP_NETWORK_ROOT)/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
 \
<     
$(GNUSTEP_SYSTEM_ROOT)/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
---
>     
> $(GNUSTEP_USER_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
>  \
>     
> $(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
>  \
>     
> $(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
>  \
>     
> $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)

92c92
<    includedir="\${prefix}/Headers"
---
>    includedir="\${prefix}/Library/Headers"