Re: [AD] build process overhaul

[Jon Rafkind <workmin@xxxxxxxxxx>]

Elias Pschernig wrote:

> On Tue, 2005-12-27 at 19:33 -0500, Jon Rafkind wrote:
>  
>
> > No problem. Are you or anyone else familiar with all the stuff in the 
> > misc/ directory? I know depdlib.sh is for unix but Im not sure of other 
> > platforms.
> >    
>
> Hm..
>
>  
>
> > grep -rI plugins.h misc | grep -v .svn
> >    
> misc/zipwin.sh:s/^.*cat tools.*msvc.plugins.h/copy \/B tools\\\\plugins\
> \\\*.inc obj\\\\msvc\\\\plugins.h/
> misc/depdlib.sh:# Special rule to create the plugins.h file
> misc/depdlib.sh:echo "\$(OBJDIR)/plugins.h: $inc_files"
> misc/depdlib.sh:echo "  cat $inc_files > \$(OBJDIR)/plugins.h"
>
> I assume, removing the obj dir everywhere should do the trick.
>
> [Oh, btw, does anybody know if there is a good way to make grep not
> include .svn dirs with the -r switch?]
>  
>
>  
I removed obj/whatever from these files. Patch attached.

Index: tools/datedit.c
===================================================================
--- tools/datedit.c	(revision 5633)
+++ tools/datedit.c	(working copy)
@@ -102,29 +102,7 @@
    int done, i;
    AL_CONST char *prop_types;
 
-   #if defined ALLEGRO_DJGPP
-      #include "obj/djgpp/plugins.h"
-   #elif defined ALLEGRO_MSVC
-      #include "obj/msvc/plugins.h"
-   #elif defined ALLEGRO_WATCOM
-      #include "obj/watcom/plugins.h"
-   #elif defined ALLEGRO_UNIX
-      #include "obj/unix/plugins.h"
-   #elif defined ALLEGRO_MINGW32
-      #include "obj/mingw32/plugins.h"
-   #elif defined ALLEGRO_BEOS
-      #include "obj/beos/plugins.h"
-   #elif defined ALLEGRO_BCC32
-      #include "obj/bcc32/plugins.h"
-   #elif defined ALLEGRO_MPW
-      #include "::obj:mpw:plugins.h"
-   #elif defined ALLEGRO_MACOSX
-      #include "obj/macosx/plugins.h"
-   #elif defined ALLEGRO_QNX
-      #include "obj/qnx/plugins.h"
-   #else
-      #error unknown platform
-   #endif
+   #include "plugins.h"
 
    do {
       done = TRUE;
Index: misc/zipwin.sh
===================================================================
--- misc/zipwin.sh	(revision 5633)
+++ misc/zipwin.sh	(working copy)
@@ -167,7 +167,7 @@
 s/\\//\\\\/g
 
 # make sure were are using command.com copy, rather than cp
-s/^.*cat tools.*msvc.plugins.h/copy \/B tools\\\\plugins\\\\*.inc obj\\\\msvc\\\\plugins.h/
+s/^.*cat tools.*msvc.plugins.h/copy \/B tools\\\\plugins\\\\*.inc tools\\\\plugins\\\\plugins.h/
 
 # add blank lines, to make the batch output more readable
 s/^\([^@]*\)$/\\
Index: misc/depdlib.sh
===================================================================
--- misc/depdlib.sh	(revision 5633)
+++ misc/depdlib.sh	(working copy)
@@ -146,6 +146,6 @@
 # Special rule to create the plugins.h file
 inc_files=`echo tools/plugins/*.inc | sed 's,tools/plugins/,$(srcdir)/tools/plugins/,g'`
 echo "\$(OBJDIR)/plugins.h: $inc_files"
-echo "	cat $inc_files > \$(OBJDIR)/plugins.h"
+echo "	cat $inc_files > tools/plugins/plugins.h"
 echo ""