Skip to content

Commit

Permalink
merge 2.0pre5 release from devel
Browse files Browse the repository at this point in the history
* devel: (446 commits)
  update version to 2.0pre5
  Make: stop creating drives in /etc/dosemu
  add fdtarball to archive
  spec: remove wrong --with-fdtarball
  Make: fix to work with multiple git workplaces
  add make-tag.sh script
  Update NEWS for -pre5
  undefault KVM for x86_64, it is not ready yet [#116]
  sdl: unifdef -DUPDATE_BY_RECTS=0 sdl.c
  sdl: raise window after creation
  dpmi: get the stack bottom with alloca()
  clang is now fully supported [fixes #160]
  simx86: fix regression of 700149e [#160]
  use uintptr_t instead of ptrdiff_t in ringbuf.c
  memory: clang does not support NULL-based ptr arithmetic [#160]
  disks: display target buffer during extended read
  disks: use hex notation for disk numbers in debug
  disks.h: use explicit-size types (fixes regression of 00a340a, PR #161)
  clang is now finally (barely) supported
  dpmi: remove the use of register variable for stack pointer
  ...
  • Loading branch information
stsp committed Apr 17, 2016
2 parents b747147 + f9f90e6 commit c5d67a0
Show file tree
Hide file tree
Showing 219 changed files with 7,104 additions and 4,278 deletions.
2 changes: 1 addition & 1 deletion COPYING.DOSEMU
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
are copyrighted under GPLv2.

3. Parts of the code not covered by the GPL are marked explicitly
within the code, and the copyrights are also at the end of this
within the code, and/or their copyrights are at the end of this
file.

4. There are no restrictions to run any (proprietary or free) DOS software
Expand Down
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ DOSEMU installation instructions (from source)
==============================================

-> REQUIREMENTS for DOSEMU:
- gcc >= 3.3
- gcc >= 3.3 or clang >= 3.7.0
- glibc >= 2.3.3
- Linux >= 3.16 (with older version there may be some problems on x86_64)
- x86 (i386/x86-64) target CPU
Expand Down
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ dosbin:

docs:
@$(MAKE) SUBDIR:=doc -C src/doc all

docsinstall:
@$(MAKE) SUBDIR:=doc -C src/doc install

docsclean:
Expand All @@ -35,12 +33,16 @@ docsclean:
$(PACKAGE_NAME).spec: $(PACKAGE_NAME).spec.in VERSION
@$(MAKE) -C src ../$@

GIT_REV := .git/$(shell git rev-parse --symbolic-full-name HEAD)
GIT_SYM := $(shell git rev-parse --symbolic-full-name HEAD)
GIT_REV := $(shell git rev-parse --git-path $(GIT_SYM))

$(PACKETNAME).tar.gz: $(GIT_REV) $(PACKAGE_NAME).spec
rm -f $(PACKETNAME).tar.gz
git archive -o $(PACKETNAME).tar --prefix=$(PACKETNAME)/ HEAD
tar rf $(PACKETNAME).tar --add-file=$(PACKAGE_NAME).spec
if [ -f $(fdtarball) ]; then \
tar rf $(PACKETNAME).tar --transform 's,^,$(PACKETNAME)/,' --add-file=$(fdtarball); \
fi
gzip $(PACKETNAME).tar

dist: $(PACKETNAME).tar.gz
Expand Down
26 changes: 7 additions & 19 deletions Makefile.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ PLUGINSUBDIRS := @PLUGINSUBDIRS@
ST_PLUGINSUBDIRS := @ST_PLUGINSUBDIRS@
REQUIRED:=@REQUIRED@

HAVE_LIBBFD := @HAVE_LIBBFD@

OS=@CONFIG_HOST@
RANLIB:=@RANLIB@

Expand All @@ -83,28 +85,14 @@ PACKAGE_VERSION_SPACES:=$(subst ., ,$(PACKAGE_VERSION))
PACKAGE_VERSION_SPACES:=$(subst -, ,$(PACKAGE_VERSION_SPACES))
PACKAGE_VERSION_SPACES:=$(subst pre, pre,$(PACKAGE_VERSION_SPACES))
VERSION:=$(word 1, $(PACKAGE_VERSION_SPACES))
SUBLEVEL_:=$(word 2, $(PACKAGE_VERSION_SPACES))
SUBLEVEL:=$(subst pre,,$(SUBLEVEL_))
SUBLEVEL:=$(word 2, $(PACKAGE_VERSION_SPACES))
PATCHLEVEL1:=$(word 3, $(PACKAGE_VERSION_SPACES))
PATCHLEVEL2:=$(word 4, $(PACKAGE_VERSION_SPACES))
ifeq (3,$(words $(PACKAGE_VERSION_SPACES)))
PATCHLEVEL2=0
endif
ifeq (5,$(words $(PACKAGE_VERSION_SPACES)))
PATCHLEVEL2=0
endif
PATCHLEVEL:=$(PATCHLEVEL1).$(PATCHLEVEL2)
ifeq "$(PATCHLEVEL2)" "0"
PACKETNAME:=$(PACKAGE_NAME)-$(VERSION).$(SUBLEVEL).$(PATCHLEVEL1)
else
PACKETNAME:=$(PACKAGE_NAME)-$(VERSION).$(SUBLEVEL).$(PATCHLEVEL)
endif
PACKETNAME:=$(subst .pre,pre,$(PACKETNAME))
THISVERSION_:=$(VERSION).$(SUBLEVEL_).$(PATCHLEVEL1)
THISVERSION:=$(subst .pre,-pre,$(THISVERSION_))
PACKVERSION:=$(subst .pre,pre,$(THISVERSION_))
PACKETNAME:=$(PACKAGE_NAME)-$(VERSION).$(SUBLEVEL)$(PATCHLEVEL1)
THISVERSION:=$(VERSION).$(SUBLEVEL)-$(PATCHLEVEL1)
PACKVERSION:=$(VERSION).$(SUBLEVEL)$(PATCHLEVEL1)
BINPATH:=$(top_builddir)/$(THISVERSION)
RELEASE_DATE:=$(shell cd $(top_srcdir) && ./getversion -d)
REVISION:=$(shell cd $(top_srcdir) && ./getversion -r)

ifdef USE_DL_PLUGINS
DL_CFLAGS:=-fPIC
Expand Down
Loading

0 comments on commit c5d67a0

Please sign in to comment.