Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Commit

Permalink
Merge pull request #152 from CyberShadow/ddoc-fixes-20120214
Browse files Browse the repository at this point in the history
Ddoc fixes
  • Loading branch information
andralex committed Feb 21, 2012
2 parents 4610715 + 1be01e3 commit 833860f
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 25 deletions.
7 changes: 4 additions & 3 deletions posix.mak
Expand Up @@ -29,6 +29,7 @@ MODEL=32

DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport -property
UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport -property
DDOCFLAGS=-m$(MODEL) -c -w -d -o- -Isrc -Iimport

CFLAGS=-m$(MODEL) -O

Expand Down Expand Up @@ -498,13 +499,13 @@ SRCS=$(addprefix src/,$(addsuffix .d,$(SRC_D_MODULES)))
doc: $(DOCS)

$(DOCDIR)/object.html : src/object_.d
$(DMD) -m$(MODEL) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $<
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $<

$(DOCDIR)/core_%.html : src/core/%.d
$(DMD) -m$(MODEL) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $<
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $<

$(DOCDIR)/core_sync_%.html : src/core/sync/%.d
$(DMD) -m$(MODEL) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $<
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $<

######################## Header .di file generation ##############################

Expand Down
4 changes: 2 additions & 2 deletions src/core/time.d
Expand Up @@ -1635,7 +1635,7 @@ struct TickDuration
)
Params:
rhs = The $(D TickDuration to add to or subtract from this
rhs = The $(D TickDuration) to add to or subtract from this
$(D TickDuration).
+/
TickDuration opBinary(string op)(TickDuration rhs) @safe const pure nothrow
Expand Down Expand Up @@ -1925,7 +1925,7 @@ struct TickDuration
$(D clock_gettime) is unavailable, then Posix systems use
$(D gettimeofday) (the decision is made when $(D TickDuration) is
compiled), which unfortunately, is not monotonic, but if
$(D mach_absolute_time) and $(D clock_gettime() aren't available, then
$(D mach_absolute_time) and $(D clock_gettime) aren't available, then
$(D gettimeofday) is the the best that there is.
$(RED Warning):
Expand Down
41 changes: 21 additions & 20 deletions win32.mak
Expand Up @@ -8,6 +8,7 @@ IMPDIR=import

DFLAGS=-O -release -inline -nofloat -w -d -Isrc -Iimport -property
UDFLAGS=-O -release -nofloat -w -d -Isrc -Iimport -property
DDOCFLAGS=-c -w -d -o- -Isrc -Iimport

CFLAGS=

Expand Down Expand Up @@ -474,64 +475,64 @@ IMPORTS=\
doc: $(DOCS)

$(DOCDIR)\object.html : src\object_.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_atomic.html : src\core\atomic.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_bitop.html : src\core\bitop.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_cpuid.html : src\core\cpuid.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_demangle.html : src\core\demangle.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_exception.html : src\core\exception.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_math.html : src\core\math.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_memory.html : src\core\memory.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_runtime.html : src\core\runtime.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_simd.html : src\core\simd.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_thread.html : src\core\thread.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_time.html : src\core\time.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_vararg.html : src\core\vararg.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_sync_barrier.html : src\core\sync\barrier.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_sync_condition.html : src\core\sync\condition.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_sync_config.html : src\core\sync\config.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_sync_exception.html : src\core\sync\exception.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_sync_mutex.html : src\core\sync\mutex.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_sync_rwmutex.html : src\core\sync\rwmutex.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

$(DOCDIR)\core_sync_semaphore.html : src\core\sync\semaphore.d
$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $**
$(DMD) $(DDOCFLAGS) -Df$@ $(DOCFMT) $**

######################## Header .di file generation ##############################

Expand Down

0 comments on commit 833860f

Please sign in to comment.