Commits

james woodyatt committed 5a5ec43

Update the version number in the top OMakefile to 1.00rc2. Fix the
documents target.

Comments (0)

Files changed (3)

     ck(checkpoints)=
         return $(this.STAGE.ck $(checkpoints))
     
+    ### Final configuration
+    final-configuration()=
+        if $(mem release, $(CONFIGURATIONS))
+            return release
+        else
+            return $(nth 0, $(CONFIGURATIONS))
+    
     ### Constructor
     new(name)=
         private.s=$(this.stage)

Conjury/lang/OCaml.om

     
     ### Add component to document search path for package
     package-search(p)=
-        p.DOCSEARCH+=$(this.STAGE.DIR)
+        p.DOCSEARCH+=$(this.STAGE.DIR)/$(this.final-configuration)
         return $p
 
 ### Class of objects that refer to an OCaml library in a component
             outputs+=$(this.compose-aux $(config), $(cmo), $(cmx), $(dst))
         return $(outputs)
     
-    ### Final configuration
-    protected.final-configuration()=
-        if $(mem release, $(CONFIGURATIONS))
-            return release
-        else
-            return $(nth 0, $(CONFIGURATIONS))
-    
     ### Construct a new composer
     protected.new(name, src, context)=
         src.NAME=$(name)
     ### Package files
     package-files(c)=
         c=$(OCaml_component.assert $c, $"OCaml_library $(NAME)")
-        cdir=$(dir $(c.STAGE.DIR)/$(final-configuration))
+        cdir=$(dir $(c.STAGE.DIR)/$(c.final-configuration))
         mli=$(module-file-by-extension .mli, $(this.MODULES))
         mll=$(module-file-by-extension .mll, $(this.MODULES))
         mly=$(module-file-by-extension .mly, $(this.MODULES))
         private.dstage=$(this.STAGE.push docs)
         OCAMLDOC.DEPEND+=$(dstage.DIR) $(this.FILES)
         OCAMLDOC.SEARCH+=$(this.DOCSEARCH)
-        return $(OCAMLDOC.html-documents $(this.FILES), $(dstage.DIR))
+        .PHONY: $(target)
+        $(target): $(OCAMLDOC.html-documents $(this.FILES), $(dstage.DIR))
+        return $(target)
 
 # End $File$
 ### The findlib package
 PKG.=
     NAME=oni
-    VERSION=1.00rc1
+    VERSION=1.00rc2
     DESCRIPTION= $"Oni - assorted components for low-level networking"
 PKG=$(OCaml_findlib_package.new $(PKG))
 export PKG