Improved build script even more..

fixed garbling of main.c strings


svn: 13

Makefile.in

@@ -124,7 +124,8 @@ clean:  cleanutils
 	@cd src && $(MAKE) clean
 	@cd src/md5 && $(MAKE) clean
 	@cd src/compat && $(MAKE) clean
-	@rm -f $(HUBEXEC) $(LEAFEXEC) *.$(MOD_EXT) *.so *.stamp core DEBUG *~ key configure.temp makesalt src/makesalt
+	@rm -f $(HUBEXEC) $(LEAFEXEC) *.$(MOD_EXT) *.so *.stamp core DEBUG *~ key configure.temp makesalt 
+	@rm -f $(HUBEXEC).* $(LEAFEXEC).* src/makesalt
 
 distclean: clean clean-modconfig
 	@cd src/mod && $(MAKE) distclean

build

@@ -9,14 +9,18 @@ TCLDIR="/home/wheel/bryan"
 
 # Awk out the version from source
 ver=`cat src/main.c 2>&1 | grep "char" | awk '/egg_version/ {print $4}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
+numver=`cat src/main.c 2>&1 | grep "int" | awk '/egg_numver =/ {print $4}' |  sed -e 's/\;//g'`
 if test -z "$ver"
 then
   ver="?.?.?"
 fi
-echo "*** wraith v$ver builder ***"
+echo "*** wraith v${ver}/${numver} builder ***"
 echo ""
 
 debug=0
+all=0
+hub=0
+leaf=0
 #if test $# -lt 1; then
 if test -z "$1"; then
  echo "Usage: $0 -d all|leaf|hub pack.conf"
@@ -65,6 +69,11 @@ if ! test $pack
  fi
 fi
 
+if [ $all = "1" ]; then
+ leaf=1
+ hub=1
+fi
+
 if test $pack
 then
   packname=$pack
@@ -137,34 +146,45 @@ then
   exit 1
 fi
 
-# Build leaf and check
-echo "[*] Building ${d}leaf..."
-make ${d}leaf CFLGS="$defines" > /dev/null
-if ! test -f leaf
-then
-  echo "[!] ${d}leaf build failed"
-  exit 1
+if [ $leaf = "1" ]; then
+ # Build leaf and check
+ echo "[*] Building ${d}leaf..."
+ make ${d}leaf CFLGS="$defines" > /dev/null
+ if ! test -f leaf
+ then
+   echo "[!] ${d}leaf build failed"
+   exit 1
+ fi
 fi
-
-# Build hub and check
-echo "[*] Building ${d}hub..."
-make ${d}hub CFLGS="$defines" > /dev/null
-if ! test -f hub
-then
-  echo "[!] ${d}hub build failed"
-  exit 1
+if [ $hub = "1" ]; then
+ # Build hub and check
+ echo "[*] Building ${d}hub..."
+ make ${d}hub CFLGS="$defines" > /dev/null
+ if ! test -f hub
+ then
+   echo "[!] ${d}hub build failed"
+   exit 1
+ fi
 fi
 
 
 # Wrap it nicely up into an archive
 echo "[*] Packaging..."
 packname=`basename $packname .conf`
-for bin in leaf hub
+if [ $all = "1" ]; then
+ fls="leaf hub"
+elif [ $leaf = "1" ]; then
+ fls="leaf"
+elif [ $hub = "1" ]; then
+ fls="hub"
+fi
+
+for bin in $fls
 do
-  mv -f $bin $os.$bin
+  mv -f $bin $bin.$os.$numver
 done
-tar -zcf $packname.$os.tgz $os.*
-rm -f $os.*
-echo "Binaries are now in '$packname.$os.tgz'."
+tar -zcf $packname.$os.$numver.tgz *.$os.$numver
+rm -f *.$os.$numver
+echo "Binaries are now in '$packname.$os.$numver.tgz'."
 exit 0
 

src/Makefile.in

@@ -63,11 +63,12 @@ dephub:
 build_msg:
 	@echo "(This may take a while.  Go get some runts.)"
 
-main.o:
-	$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) \
-'-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \
-'-DLDFLAGS="$(LD)"' \
-'-DSTRIPFLAGS="$(STRIP)"' -c $(srcdir)/main.c
+
+main.o: ../stringfix
+	cp -f main.c xmain.c
+	../stringfix xmain.c
+	$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) '-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \
+	'-DLDFLAGS="$(LD)"' '-DSTRIPFLAGS="$(STRIP)"' -c $(srcdir)/xmain.c -o main.o
 
 compatability:
 	@cd compat && $(MAKE_GENERIC) compat
@@ -97,8 +98,6 @@ eggdrop.h:
 	$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) '-DCCFLAGS="$(CC) $(CFLAGS) -I$(top_srcdir) \
         $(CPPFLAGS)"' '-DLDFLAGS="$(LD)"' \
         '-DSTRIPFLAGS="$(STRIP)"' -c x$< -o `basename $< .c`.o
-#.c.o:
-#	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
 
 #safety hash
 ../stringfix: stringfix.c