Restricted dependencies to a specific subset of old packages that wor…

…k together.

DEVLOG.md

@@ -0,0 +1,8 @@
+
+DEVLOG
+====================================================================================================
+
+This is a log for day-to-day development issues.  It does not make
+very good reading, but is helpful for search & reference by the
+developers.
+

Intel/Cnc/Spec/Version.hs

@@ -1,4 +1,4 @@
 -- WARNING: This file is generated from the .cabal file.
 module Intel.Cnc.Spec.Version where
-version = "0.1.3.108"
-builddate = "2011-01-26 20:45:05.358574 UTC"
+version = "0.2"
+builddate = "2011-08-11 20:36:57.60858 UTC"

Makefile

@@ -49,7 +49,7 @@ trans:
 	$(MAKE) $(BUILDDIR)/$(HCNCNAME)
 
 Intel/Cnc/Spec/Version.hs: 
-	runhaskell extract_version.hs
+	runhaskell ./scripts/extract_version.hs
 
 release:
 	GHCFLAGS="-rtsopts -O2" $(MAKE) $(BUILDDIR)/$(HCNCNAME).stripped

README.txt → README.md

@@ -1,8 +1,8 @@
 
----------------------------------------------
+
 Concurrent Collections Specification Compiler
----------------------------------------------
- Author: Ryan Newton, Copyright 2009-2011
+=============================================
+  Author: Ryan Newton, Copyright 2009-2011
 
 
 This directory contains an implementation of a compiler/translator for
@@ -20,20 +20,20 @@ package through cabal.  Currently, this directory contains a Makefile
 and other scripts that are redundant with the cabal file and will be
 removed in the future.
 
-----------------------------------------------
+
  Building and running the CnC Spec Compiler:
 ----------------------------------------------
 
 The main entrypoint for the Spec tool is Intel/Cnc/Spec/Main.hs.
 
-OPTION 1: Type "make"
+ * OPTION 1: Type "make"
 
-OPTION 2: Try ghc --make directly
+ * OPTION 2: Try ghc --make directly
+
+ * OPTION 3: Try "cabal install" in this directory.
 
-OPTION 3: Try "cabal install" in this directory.
 
 
-----------------------------------------------
  Unit and system tests:
 ----------------------------------------------
 

cnc-spec-compiler.cabal

@@ -40,18 +40,27 @@ source-repository head
 
 Executable cnc
   Main-is:           Intel/Cnc/Spec/Main.hs
-  Build-Depends:     base >= 3 && < 5, directory, process, containers, unix, bytestring
+  Build-Depends:     base >= 3 && < 5
+                   , directory, process, containers, unix, bytestring, array
                    , prettyclass, pretty, HUnit, mtl
                    , stringtable-atom, filepath, split
                    , parsec >= 3.1.0
-                   , hubigraph
                    , hscurses, ansi-terminal
                    , fgl
                    , zlib, binary
--- Need these for GraphAnalysis.hs:
+-- graphviz is needed for GraphAnalysis.hs (not just visualization):
                    , Graphalyze 
 --		   , graphviz
 --                 , haxr, HTTP, network
+-- For visualization:
+                   , hubigraph
+--
+-- [2011.08.11] There are currently polyparse dependency problems.
+--   hubigraph -> haxr -> HaXml -> polyparse
+--
+-- I am addressing this currently by pinning older versions:
+                   , HaXml == 1.20.2
+                   , haxr  == 3000.8.2
 
   extensions: CPP
 -- Disabling for now.  We will make this optional:

scripts/extract_version.hs

@@ -0,0 +1,29 @@
+#!/usr/bin/env runhaskell
+{-# LANGUAGE ScopedTypeVariables #-}
+
+-- A simple script to extract the version number from the .cabal file and stick it in the code.
+
+import System.IO
+import Data.Time
+import HSH
+import HSH.ShellEquivs
+
+dubquote str = "\"" ++ str ++ "\""
+
+main = do 
+  fh <-  openFile "Intel/Cnc/Spec/Version.hs" WriteMode 
+
+  date <- getCurrentTime
+
+  version_lines :: [String] <- run $ catFrom ["cnc-spec-compiler.cabal"] -|- grep "Version" 
+  let version = words (head version_lines) !! 1 
+
+  --let version   = "0.1.3.100"
+
+  hPutStrLn fh$ "-- WARNING: This file is generated from the .cabal file."
+  hPutStrLn fh$ "module Intel.Cnc.Spec.Version where"
+  hPutStrLn fh$ "version = " ++ dubquote version
+  hPutStrLn fh$ "builddate = " ++ dubquote (show date)
+
+  hClose fh
+