Skip to content

Commit 9af15c7

Browse files
dkldkl
committed
Revert "bindist: Rely on "make install" instead of copying manually"
This reverts commit bb98b88. 1. That doesn't package binutils and the non-FB libs for standalone 2. The recursive make invocation loses makefile variables such as ENABLE_STANDALONE or TARGET_*
1 parent 96f5d91 commit 9af15c7

File tree

1 file changed

+166
-145
lines changed

1 file changed

+166
-145
lines changed

‎makefile‎

Lines changed: 166 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -745,161 +745,182 @@ ifndef FBMANIFEST
745745
FBMANIFEST := $(subst -$(FBVERSION),,$(FBPACKAGE))
746746
endif
747747

748-
ifdef ENABLE_STANDALONE
749-
packinc := $(FBPACKAGE)/inc/
750-
else
751-
packinc := $(FBPACKAGE)/include/$(FBNAME)/
752-
endif
753-
754748
.PHONY: bindist
755749
bindist:
756750
# Extra directory in which we'll put together the binary release package
757751
# (needed anyways to avoid tarbombs)
752+
mkdir -p $(FBPACKAGE)/bin $(FBPACKAGE)/lib
753+
754+
# Binaries from the build dir: fbc[.exe] or bin/fbc[.exe], bin/ and lib/
755+
# (we're expecting bin/ and lib/ to be filled with the proper external
756+
# binaries already in case of standalone setups)
757+
ifdef ENABLE_STANDALONE
758+
cp -R bin/$(FBTARGET) $(FBPACKAGE)/bin
759+
cp -R lib/$(FBTARGET) $(FBPACKAGE)/lib
760+
cp $(FBC_EXE) $(FBPACKAGE)
761+
else
762+
mkdir -p $(FBPACKAGE)/lib/freebasic
763+
cp $(FBC_EXE) $(FBPACKAGE)/bin
764+
cp -R lib/freebasic/$(FBTARGET) $(FBPACKAGE)/lib/freebasic
765+
endif
758766

759-
make install prefix=$(FBPACKAGE)
767+
# Remove lib/win32/*.def stuff. We have it in the source tree (not in
768+
# build dir if separate though) but don't want to include it into the
769+
# binary release packages.
770+
cd $(FBPACKAGE) && rm -rf lib/win32/*.def lib/win32/makefile lib/fbextra.x
771+
rmdir $(FBPACKAGE)/lib/win32 || true
760772

773+
# Includes: inc/, include/freebasic/ or include/freebas/
774+
cp -R $(rootdir)inc $(FBPACKAGE)
761775
ifeq ($(TARGET_OS),dos)
762-
rm -r $(packinc)AL
763-
rm -r $(packinc)allegro5
764-
rm -r $(packinc)atk
765-
rm -r $(packinc)bass.bi
766-
rm -r $(packinc)bassmod.bi
767-
rm -r $(packinc)cairo
768-
rm -r $(packinc)cd
769-
rm -r $(packinc)chipmunk
770-
rm -r $(packinc)crt/arpa
771-
rm -r $(packinc)crt/bits
772-
rm -r $(packinc)crt/linux
773-
rm -r $(packinc)crt/netdb.bi
774-
rm -r $(packinc)crt/netinet/in.bi
775-
rm -r $(packinc)crt/netinet/linux/in.bi
776-
rm -r $(packinc)crt/sys/linux
777-
rm -r $(packinc)crt/sys/socket.bi
778-
rm -r $(packinc)crt/sys/win32
779-
rm -r $(packinc)crt/win32
780-
rm -r $(packinc)curses/ncurses.bi
781-
rm -r $(packinc)disphelper
782-
rm -r $(packinc)fastcgi
783-
rm -r $(packinc)ffi.bi
784-
rm -r $(packinc)flite
785-
rm -r $(packinc)fmod.bi
786-
rm -r $(packinc)fontconfig
787-
rm -r $(packinc)FreeImage.bi
788-
rm -r $(packinc)freetype2
789-
rm -r $(packinc)gdk*
790-
rm -r $(packinc)gio
791-
rm -r $(packinc)GL
792-
rm -r $(packinc)glade
793-
rm -r $(packinc)glib*
794-
rm -r $(packinc)gmodule.bi
795-
rm -r $(packinc)goocanvas.bi
796-
rm -r $(packinc)gtk*
797-
rm -r $(packinc)im
798-
rm -r $(packinc)IUP*
799-
rm -r $(packinc)japi*
800-
rm -r $(packinc)jni.bi
801-
rm -r $(packinc)json*
802-
rm -r $(packinc)libart_lgpl
803-
rm -r $(packinc)MediaInfo*
804-
rm -r $(packinc)modplug.bi
805-
rm -r $(packinc)mpg123.bi
806-
rm -r $(packinc)mysql
807-
rm -r $(packinc)Newton.bi
808-
rm -r $(packinc)ode
809-
rm -r $(packinc)ogg
810-
rm -r $(packinc)pango
811-
rm -r $(packinc)pdflib.bi
812-
rm -r $(packinc)portaudio.bi
813-
rm -r $(packinc)postgresql
814-
rm -r $(packinc)SDL
815-
rm -r $(packinc)SDL2
816-
rm -r $(packinc)sndfile.bi
817-
rm -r $(packinc)spidermonkey
818-
rm -r $(packinc)uuid.bi
819-
rm -r $(packinc)vlc
820-
rm -r $(packinc)vorbis
821-
rm -r $(packinc)win
822-
rm -r $(packinc)windows.bi
823-
rm -r $(packinc)wx-c
824-
rm -r $(packinc)X11
825-
rm -r $(packinc)xmp.bi
826-
rm -r $(packinc)zmq
776+
rm -r $(FBPACKAGE)/inc/AL
777+
rm -r $(FBPACKAGE)/inc/allegro5
778+
rm -r $(FBPACKAGE)/inc/atk
779+
rm -r $(FBPACKAGE)/inc/bass.bi
780+
rm -r $(FBPACKAGE)/inc/bassmod.bi
781+
rm -r $(FBPACKAGE)/inc/cairo
782+
rm -r $(FBPACKAGE)/inc/cd
783+
rm -r $(FBPACKAGE)/inc/chipmunk
784+
rm -r $(FBPACKAGE)/inc/crt/arpa
785+
rm -r $(FBPACKAGE)/inc/crt/bits
786+
rm -r $(FBPACKAGE)/inc/crt/linux
787+
rm -r $(FBPACKAGE)/inc/crt/netdb.bi
788+
rm -r $(FBPACKAGE)/inc/crt/netinet/in.bi
789+
rm -r $(FBPACKAGE)/inc/crt/netinet/linux/in.bi
790+
rm -r $(FBPACKAGE)/inc/crt/sys/linux
791+
rm -r $(FBPACKAGE)/inc/crt/sys/socket.bi
792+
rm -r $(FBPACKAGE)/inc/crt/sys/win32
793+
rm -r $(FBPACKAGE)/inc/crt/win32
794+
rm -r $(FBPACKAGE)/inc/curses/ncurses.bi
795+
rm -r $(FBPACKAGE)/inc/disphelper
796+
rm -r $(FBPACKAGE)/inc/fastcgi
797+
rm -r $(FBPACKAGE)/inc/ffi.bi
798+
rm -r $(FBPACKAGE)/inc/flite
799+
rm -r $(FBPACKAGE)/inc/fmod.bi
800+
rm -r $(FBPACKAGE)/inc/fontconfig
801+
rm -r $(FBPACKAGE)/inc/FreeImage.bi
802+
rm -r $(FBPACKAGE)/inc/freetype2
803+
rm -r $(FBPACKAGE)/inc/gdk*
804+
rm -r $(FBPACKAGE)/inc/gio
805+
rm -r $(FBPACKAGE)/inc/GL
806+
rm -r $(FBPACKAGE)/inc/glade
807+
rm -r $(FBPACKAGE)/inc/glib*
808+
rm -r $(FBPACKAGE)/inc/gmodule.bi
809+
rm -r $(FBPACKAGE)/inc/goocanvas.bi
810+
rm -r $(FBPACKAGE)/inc/gtk*
811+
rm -r $(FBPACKAGE)/inc/im
812+
rm -r $(FBPACKAGE)/inc/IUP*
813+
rm -r $(FBPACKAGE)/inc/japi*
814+
rm -r $(FBPACKAGE)/inc/jni.bi
815+
rm -r $(FBPACKAGE)/inc/json*
816+
rm -r $(FBPACKAGE)/inc/libart_lgpl
817+
rm -r $(FBPACKAGE)/inc/MediaInfo*
818+
rm -r $(FBPACKAGE)/inc/modplug.bi
819+
rm -r $(FBPACKAGE)/inc/mpg123.bi
820+
rm -r $(FBPACKAGE)/inc/mysql
821+
rm -r $(FBPACKAGE)/inc/Newton.bi
822+
rm -r $(FBPACKAGE)/inc/ode
823+
rm -r $(FBPACKAGE)/inc/ogg
824+
rm -r $(FBPACKAGE)/inc/pango
825+
rm -r $(FBPACKAGE)/inc/pdflib.bi
826+
rm -r $(FBPACKAGE)/inc/portaudio.bi
827+
rm -r $(FBPACKAGE)/inc/postgresql
828+
rm -r $(FBPACKAGE)/inc/SDL
829+
rm -r $(FBPACKAGE)/inc/SDL2
830+
rm -r $(FBPACKAGE)/inc/sndfile.bi
831+
rm -r $(FBPACKAGE)/inc/spidermonkey
832+
rm -r $(FBPACKAGE)/inc/uuid.bi
833+
rm -r $(FBPACKAGE)/inc/vlc
834+
rm -r $(FBPACKAGE)/inc/vorbis
835+
rm -r $(FBPACKAGE)/inc/win
836+
rm -r $(FBPACKAGE)/inc/windows.bi
837+
rm -r $(FBPACKAGE)/inc/wx-c
838+
rm -r $(FBPACKAGE)/inc/X11
839+
rm -r $(FBPACKAGE)/inc/xmp.bi
840+
rm -r $(FBPACKAGE)/inc/zmq
827841
endif
828-
829842
ifeq ($(TARGET_ARCH),x86_64)
830843
# Exclude headers which don't support 64bit yet
831-
rm -r $(packinc)AL
832-
rm -r $(packinc)aspell.bi
833-
rm -r $(packinc)bass.bi
834-
rm -r $(packinc)bassmod.bi
835-
rm -r $(packinc)bfd
836-
rm -r $(packinc)bfd.bi
837-
rm -r $(packinc)big_int
838-
rm -r $(packinc)bzlib.bi
839-
rm -r $(packinc)caca0.bi
840-
rm -r $(packinc)caca.bi
841-
rm -r $(packinc)cd
842-
rm -r $(packinc)cgi-util.bi
843-
rm -r $(packinc)chipmunk
844-
rm -r $(packinc)cryptlib.bi
845-
rm -r $(packinc)dislin.bi
846-
rm -r $(packinc)disphelper
847-
rm -r $(packinc)dos
848-
rm -r $(packinc)expat.bi
849-
rm -r $(packinc)flite
850-
rm -r $(packinc)FreeImage.bi
851-
rm -r $(packinc)gd.bi
852-
rm -r $(packinc)gdbm.bi
853-
rm -r $(packinc)gdsl
854-
rm -r $(packinc)gettext-po.bi
855-
rm -r $(packinc)gif_lib.bi
856-
rm -r $(packinc)glade
857-
rm -r $(packinc)gmp.bi
858-
rm -r $(packinc)goocanvas.bi
859-
rm -r $(packinc)grx
860-
rm -r $(packinc)gsl
861-
rm -r $(packinc)IL
862-
rm -r $(packinc)im
863-
rm -r $(packinc)japi.bi
864-
rm -r $(packinc)jni.bi
865-
rm -r $(packinc)jpeglib.bi
866-
rm -r $(packinc)jpgalleg.bi
867-
rm -r $(packinc)json-c
868-
rm -r $(packinc)libart_lgpl
869-
rm -r $(packinc)libintl.bi
870-
rm -r $(packinc)libxml
871-
rm -r $(packinc)libxslt
872-
rm -r $(packinc)lzma.bi
873-
rm -r $(packinc)lzo
874-
rm -r $(packinc)MediaInfo.bi
875-
rm -r $(packinc)modplug.bi
876-
rm -r $(packinc)mpg123.bi
877-
rm -r $(packinc)mxml.bi
878-
rm -r $(packinc)mysql
879-
rm -r $(packinc)Newton.bi
880-
rm -r $(packinc)ode
881-
rm -r $(packinc)ogg
882-
rm -r $(packinc)pcre16.bi
883-
rm -r $(packinc)pcre.bi
884-
rm -r $(packinc)pcreposix.bi
885-
rm -r $(packinc)pdflib.bi
886-
rm -r $(packinc)portaudio.bi
887-
rm -r $(packinc)postgresql
888-
rm -r $(packinc)quicklz.bi
889-
rm -r $(packinc)sndfile.bi
890-
rm -r $(packinc)spidermonkey
891-
rm -r $(packinc)sqlite2.bi
892-
rm -r $(packinc)sqlite3.bi
893-
rm -r $(packinc)sqlite3ext.bi
894-
rm -r $(packinc)tinyptc.bi
895-
rm -r $(packinc)uuid.bi
896-
rm -r $(packinc)vlc
897-
rm -r $(packinc)vorbis
898-
rm -r $(packinc)win/ddk
899-
rm -r $(packinc)win/rc
900-
rm -r $(packinc)wx-c
901-
rm -r $(packinc)xmp.bi
902-
rm -r $(packinc)zmq
844+
rm -r $(FBPACKAGE)/inc/AL
845+
rm -r $(FBPACKAGE)/inc/aspell.bi
846+
rm -r $(FBPACKAGE)/inc/bass.bi
847+
rm -r $(FBPACKAGE)/inc/bassmod.bi
848+
rm -r $(FBPACKAGE)/inc/bfd
849+
rm -r $(FBPACKAGE)/inc/bfd.bi
850+
rm -r $(FBPACKAGE)/inc/big_int
851+
rm -r $(FBPACKAGE)/inc/bzlib.bi
852+
rm -r $(FBPACKAGE)/inc/caca0.bi
853+
rm -r $(FBPACKAGE)/inc/caca.bi
854+
rm -r $(FBPACKAGE)/inc/cd
855+
rm -r $(FBPACKAGE)/inc/cgi-util.bi
856+
rm -r $(FBPACKAGE)/inc/chipmunk
857+
rm -r $(FBPACKAGE)/inc/cryptlib.bi
858+
rm -r $(FBPACKAGE)/inc/dislin.bi
859+
rm -r $(FBPACKAGE)/inc/disphelper
860+
rm -r $(FBPACKAGE)/inc/dos
861+
rm -r $(FBPACKAGE)/inc/expat.bi
862+
rm -r $(FBPACKAGE)/inc/flite
863+
rm -r $(FBPACKAGE)/inc/FreeImage.bi
864+
rm -r $(FBPACKAGE)/inc/gd.bi
865+
rm -r $(FBPACKAGE)/inc/gdbm.bi
866+
rm -r $(FBPACKAGE)/inc/gdsl
867+
rm -r $(FBPACKAGE)/inc/gettext-po.bi
868+
rm -r $(FBPACKAGE)/inc/gif_lib.bi
869+
rm -r $(FBPACKAGE)/inc/glade
870+
rm -r $(FBPACKAGE)/inc/gmp.bi
871+
rm -r $(FBPACKAGE)/inc/goocanvas.bi
872+
rm -r $(FBPACKAGE)/inc/grx
873+
rm -r $(FBPACKAGE)/inc/gsl
874+
rm -r $(FBPACKAGE)/inc/IL
875+
rm -r $(FBPACKAGE)/inc/im
876+
rm -r $(FBPACKAGE)/inc/japi.bi
877+
rm -r $(FBPACKAGE)/inc/jni.bi
878+
rm -r $(FBPACKAGE)/inc/jpeglib.bi
879+
rm -r $(FBPACKAGE)/inc/jpgalleg.bi
880+
rm -r $(FBPACKAGE)/inc/json-c
881+
rm -r $(FBPACKAGE)/inc/libart_lgpl
882+
rm -r $(FBPACKAGE)/inc/libintl.bi
883+
rm -r $(FBPACKAGE)/inc/libxml
884+
rm -r $(FBPACKAGE)/inc/libxslt
885+
rm -r $(FBPACKAGE)/inc/lzma.bi
886+
rm -r $(FBPACKAGE)/inc/lzo
887+
rm -r $(FBPACKAGE)/inc/MediaInfo.bi
888+
rm -r $(FBPACKAGE)/inc/modplug.bi
889+
rm -r $(FBPACKAGE)/inc/mpg123.bi
890+
rm -r $(FBPACKAGE)/inc/mxml.bi
891+
rm -r $(FBPACKAGE)/inc/mysql
892+
rm -r $(FBPACKAGE)/inc/Newton.bi
893+
rm -r $(FBPACKAGE)/inc/ode
894+
rm -r $(FBPACKAGE)/inc/ogg
895+
rm -r $(FBPACKAGE)/inc/pcre16.bi
896+
rm -r $(FBPACKAGE)/inc/pcre.bi
897+
rm -r $(FBPACKAGE)/inc/pcreposix.bi
898+
rm -r $(FBPACKAGE)/inc/pdflib.bi
899+
rm -r $(FBPACKAGE)/inc/portaudio.bi
900+
rm -r $(FBPACKAGE)/inc/postgresql
901+
rm -r $(FBPACKAGE)/inc/quicklz.bi
902+
rm -r $(FBPACKAGE)/inc/sndfile.bi
903+
rm -r $(FBPACKAGE)/inc/spidermonkey
904+
rm -r $(FBPACKAGE)/inc/sqlite2.bi
905+
rm -r $(FBPACKAGE)/inc/sqlite3.bi
906+
rm -r $(FBPACKAGE)/inc/sqlite3ext.bi
907+
rm -r $(FBPACKAGE)/inc/tinyptc.bi
908+
rm -r $(FBPACKAGE)/inc/uuid.bi
909+
rm -r $(FBPACKAGE)/inc/vlc
910+
rm -r $(FBPACKAGE)/inc/vorbis
911+
rm -r $(FBPACKAGE)/inc/win/ddk
912+
rm -r $(FBPACKAGE)/inc/win/rc
913+
rm -r $(FBPACKAGE)/inc/wx-c
914+
rm -r $(FBPACKAGE)/inc/xmp.bi
915+
rm -r $(FBPACKAGE)/inc/zmq
916+
endif
917+
ifndef ENABLE_STANDALONE
918+
mkdir -p $(FBPACKAGE)/include
919+
ifeq ($(TARGET_OS),dos)
920+
mv $(FBPACKAGE)/inc $(FBPACKAGE)/include/freebas
921+
else
922+
mv $(FBPACKAGE)/inc $(FBPACKAGE)/include/freebasic
923+
endif
903924
endif
904925

905926
ifndef DISABLE_DOCS

0 commit comments

Comments
 (0)