detect format error on Import..., and convert (as it was intended)

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index 1bfe2db09ad4319d1d2591856b428faf77035aa6..42d9f1d51ca7416183876f240e8f11223b8be91e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -224,7 +224,8 @@ endif
 endif
 
 # VERSION!
-RADIANT_VERSION = 1.5.0n
+RADIANT_VERSION_NUMBER = 1.5.0
+RADIANT_VERSION = $(RADIANT_VERSION_NUMBER)n
 RADIANT_MAJOR_VERSION = 5
 RADIANT_MINOR_VERSION = 0
 Q3MAP_VERSION = 2.5.17n
@@ -424,6 +425,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \
        tools/quake3/q3map2/bspfile_rbsp.o \
        tools/quake3/q3map2/bsp.o \
        tools/quake3/q3map2/convert_ase.o \
+       tools/quake3/q3map2/convert_obj.o \
        tools/quake3/q3map2/convert_map.o \
        tools/quake3/q3map2/decals.o \
        tools/quake3/q3map2/facebsp.o \
@@ -1006,16 +1008,25 @@ install-dll: binaries
 endif
 endif
 
-release-src: BUILD_DATE := `date +%Y%m%d`
-release-src: MAKEFILE_CONF := cross-Makefile.conf
-release-src: INSTALLDIR := netradiant-$(RADIANT_VERSION)-$(BUILD_DATE)
+# release building... NOT for general users
+# these may use tools not in the list that is checked by the build system
+release-src: BUILD_DATE := $(shell date +%Y%m%d)
+release-src: INSTALLDIR := netradiant-$(RADIANT_VERSION_NUMBER)-$(BUILD_DATE)
 release-src:
-       git archive --format=tar HEAD | bzip2 > $(INSTALLDIR).tar.bz2
-
-release-win32: BUILD_DATE := `date +%Y%m%d`
-release-win32: MAKEFILE_CONF := cross-Makefile.conf
-release-win32: INSTALLDIR := netradiant-$(RADIANT_VERSION)-$(BUILD_DATE)
-release-win32: install
-       7za a -sfx../../../../../../../../../../$(HOME)/7z.sfx $(INSTALLDIR)-win32-7z.exe $(INSTALLDIR)/
-
+       $(GIT) archive --format=tar --prefix=$(INSTALLDIR)/ HEAD | bzip2 > ../$(INSTALLDIR).tar.bz2
+
+release-win32: BUILD_DATE := $(shell date +%Y%m%d)
+release-win32: INSTALLDIR := netradiant-$(RADIANT_VERSION_NUMBER)-$(BUILD_DATE)
+release-win32:
+       $(MAKE) all INSTALLDIR=$(INSTALLDIR) MAKEFILE_CONF=cross-Makefile.conf RADIANT_ABOUTMSG="Official release build" BUILD=release
+       7za a -sfx../../../../../../../../../../$(HOME)/7z.sfx ../$(INSTALLDIR)-win32-7z.exe $(INSTALLDIR)/
+       chmod 644 ../$(INSTALLDIR)-win32-7z.exe # 7zip is evil
+       $(MAKE) clean INSTALLDIR=$(INSTALLDIR) MAKEFILE_CONF=cross-Makefile.conf RADIANT_ABOUTMSG="Official release build" BUILD=release
+
+release-all:
+       $(GIT) clean -xdf
+       $(MAKE) release-src
+       $(MAKE) release-win32
+
+# load dependency files
 -include $(shell find . -name \*.d)