debian/0000755000000000000000000000000012256024057007171 5ustar debian/changelog0000644000000000000000000001014512256024057011044 0ustar confluence (0.10.6-7build3) trusty; urgency=medium * Rebuild for ocaml-4.01. -- Matthias Klose Mon, 23 Dec 2013 12:10:23 +0000 confluence (0.10.6-7build2) oneiric; urgency=low * Rebuild to pick up armel ocaml fixes. -- Adam Conrad Fri, 19 Aug 2011 13:09:15 -0600 confluence (0.10.6-7build1) oneiric; urgency=low * Rebuild for OCaml 3.12.0. -- Colin Watson Mon, 16 May 2011 19:57:42 +0100 confluence (0.10.6-7) unstable; urgency=low [ Stephane Glondu ] * Switch packaging to git [ Ralf Treinen ] * Switch source format to 3.0 (quilt): - comvert patches to quilt style - no more build-dependency on dpatch - no more patching in debian/rules - create file debian/source/format * Add dependency on ${misc:Depends} * Standards-version 3.8.4 (no change) * Fix typo in debian/README.debian * Create a copy of the fnf manpage in in debian/manpages, escape hyphens and add a correct whatis entry. * Added debian/confluence.install for installation of extra files, call dh_install from debian/rules. * Added debian/vim/confluence.yaml, install it into /usr/share/vim/registry (closes: Bug#464819). * Recommends vim-addon-manager, and added in README.debian a note about the vim addon, as suggested in the debian vim policy. -- Ralf Treinen Sun, 31 Jan 2010 19:40:42 +0100 confluence (0.10.6-6) unstable; urgency=low [ Stefano Zacchiroli ] * promote Homepage to a real debian/control field * fix vcs-svn field to point just above the debian/ dir [ Ralf Treinen ] * Fix typo in debian/watch (closes: Bug#450078) * Changed doc-base section to Science/Electronics * DH compat level 5 * Standards-Version 3.8.1 (no change) [ Stephane Glondu ] * Remove Julien from Uploaders [ Mehdi Dogguy ] * Fix watch file (closes: Bug#529104) -- Ralf Treinen Fri, 22 May 2009 09:33:14 +0200 confluence (0.10.6-5) unstable; urgency=low * Adopting the package for debian-ocaml-maint (closes: Bug#418965). * debian/control: added XS-Vcs-Svn and XS-Vcs-Browse fields. * Adapted debian/svn-deblayout to the pkg-ocaml directory layout * Use dpatch to manage patches, put diff from 0.10.6-4 into 01config.dpatch * debian/watch: point now to fundhl.org * debian/rules: cleanup * debian/rules: do not ignore errors of "make clean" * Build-depend on ocaml-nox >= 3.10 in order to force autobuildes to use the right ocaml version. * Standards-Version 3.7.2.2 (no change) * Register documentation with doc-base * Removed package maintainer from debian/copyright. * Explain status of the package in debian/README.Debian. -- Ralf Treinen Sat, 08 Sep 2007 19:49:08 +0200 confluence (0.10.6-4) unstable; urgency=low * Orphaning; this package is superceded by HDCaml upstream, and I no longer use that or this package. -- Wesley J. Landaker Thu, 12 Apr 2007 20:57:40 -0600 confluence (0.10.6-3) unstable; urgency=low * Allow building on archs without ocamlopt (closes: #345887) - Thanks to Julien Cristau for the patch. -- Wesley J. Landaker Wed, 4 Jan 2006 11:31:17 -0700 confluence (0.10.6-2) unstable; urgency=low * Standards-Version to 3.6.2 * Updated FSF address in debian/copyright -- Wesley J. Landaker Wed, 9 Nov 2005 11:12:48 -0700 confluence (0.10.6-1) unstable; urgency=low * New upstream release -- Wesley J. Landaker Wed, 28 Sep 2005 17:57:15 -0600 confluence (0.10.5-1) unstable; urgency=low * New upstream release * Updated watch file * Fixed confluence.vim install location (closes: #306777) -- Wesley J. Landaker Thu, 28 Apr 2005 17:24:52 -0600 confluence (0.10.4-2) unstable; urgency=low * Fix up debian/watch for uscan version=3 -- Wesley J. Landaker Sat, 26 Mar 2005 23:14:28 -0700 confluence (0.10.4-1) unstable; urgency=low * Initial Release (closes: #301410) -- Wesley J. Landaker Fri, 25 Mar 2005 09:22:39 -0700 debian/rules0000755000000000000000000000274211331353230010245 0ustar #!/usr/bin/make -f # debian/rules for confluence #export DH_VERBOSE=1 ifeq ($(wildcard /usr/bin/ocamlopt),) OCAML_DEP = ocaml-base-nox-$(shell ocamlc -version) endif build: build-stamp build-stamp: dh_testdir if [ -x /usr/bin/ocamlopt ]; then \ $(MAKE) PREFIX=$(CURDIR)/debian/confluence/usr OCAMLC=ocamlc OCAMLOPT=ocamlopt; \ else \ $(MAKE) -C src PREFIX=$(CURDIR)/debian/confluence/usr OCAMLC=ocamlc fnf.byte cf.byte doc; \ fi touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp $(MAKE) clean dh_clean cf.1 fnf.1 install: build dh_testdir dh_testroot dh_clean -k dh_installdirs if [ -x /usr/bin/ocamlopt ]; then \ $(MAKE) install PREFIX=$(CURDIR)/debian/confluence/usr OCAMLC=ocamlc OCAMLOPT=ocamlopt; \ else \ $(MAKE) -C src install-byte PREFIX=$(CURDIR)/debian/confluence/usr && \ $(MAKE) install-cf PREFIX=$(CURDIR)/debian/confluence/usr; \ fi find $(CURDIR)/debian/confluence/usr/share/confluence/ -name "*.cf" -exec chmod 644 {} \; $(CURDIR)/debian/confluence/usr/bin/cf | txt2man -s 1 -t cf > cf.1 binary-indep: build install binary-arch: build install dh_testdir dh_testroot dh_install dh_installchangelogs dh_installdocs dh_installexamples dh_installman cf.1 debian/manpages/fnf.1 dh_link dh_strip dh_compress dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol -- -Vocaml:Depends=$(OCAML_DEP) dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install debian/doc-base.confluence0000644000000000000000000000032111331353230012674 0ustar Document: confluence Title: Confluence Documentation Section: Science/Electronics Author: Tom Hawkins Format: HTML Index: /usr/share/doc/confluence/doc/index.html Files: /usr/share/doc/confluence/doc/*.html debian/README.Debian0000644000000000000000000000170211331353230011221 0ustar This package provides the vim addon confluence, but it is not enabled per default. If you want to enable it for your user account just execute vim-addons install confluence. Similarly, to enable it for all users of this system just execute (as root) vim-addons -w install confluence. vim-addons is provided by the vim-addon-manager package, have a look at its manpage for more information. ========================================================================== This package has been adopted by the Debian Ocaml Maintainers team in order to coordinate with future releases of ocaml. Besides this we have no particular interest in this package, adoption or other help by anyone being interested in this package is most welcome. Also note that this package has been abandoned by upstream, and that it is superseded by the "atom" project: http://www.funhdl.org/wiki/doku.php/confluence -- Ralf Treinen , Sun, 31 Jan 2010 20:05:24 +0100 debian/gbp.conf0000644000000000000000000000003611331353230010576 0ustar [DEFAULT] pristine-tar = True debian/manpages/0000755000000000000000000000000011331353230010753 5ustar debian/manpages/README0000644000000000000000000000022011331353230011625 0ustar A first version of the fnf manpage was generated by fnf | txt2man -s 1 -t fnf > fnf.1 and then edited by hand. [Ralf Treinen, 2010/1/31] debian/manpages/fnf.10000644000000000000000000000541511331353230011613 0ustar .\"Text automatically generated by txt2man .TH fnf 1 "31 January 2010" "" "" .SS NAME \fBfnf \- translate from FNF format to other formats \fB .SS SYNOPSIS .nf .fam C \fBfnf\fP [\fIoptions\fP] .fam T .fi .fam T .fi .SS DESCRIPTION FNF (Free Netlist Format) is an elaborated, hierarchical, register transfer level (RTL) netlist format used to communicate design information between frontend EDA tools. .PP The FNF tool translates an FNF netlist to Verilog, VHDL, C, and NuSMV. .SS OPTIONS Options are processed in the order they are received. .PP \fB-h\fP OR \fB-help\fP Prints this information then exits. .PP \fB-read_fnf\fP file Read in an FNF netlist. .PP \fB-write_fnf\fP file Write out an FNF netlist. .PP \fB-write_nusmv\fP file Write out an NuSMV description. .PP \fB-write_verilog\fP file Write out a Verilog netlist. .PP \fB-write_vhdl\fP file Write out a VHDL netlist. .PP \fB-write_c\fP file .RS .TP .B Write out a C model. Appends '.c' and '.h' to file name. .RE .PP \fB-write_jhdl\fP class .RS .TP .B Write out a JHDL netlist. Appends .java to class name. .SS EXAMPLES Building an FNF netlist from Verilog using Icarus: .PP .nf .fam C $ iverilog \-Wall \-t fnf \-o my_netlist.fnf my_verilog.v .fam T .fi Use FNF to produce a Verilog and C model: .PP .nf .fam C $ fnf \-read_fnf my_netlist.fnf \-write_verilog my_netlist.v \-write_c my_netlist .fam T .fi Use FNF to produce an NuSMV model: .PP .nf .fam C $ fnf \-read_fnf my_netlist.fnf \-write_nusmv my_netlist.smv .fam T .fi Use FNF to produce another FNF netlist: .PP .nf .fam C $ fnf \-read_fnf my_netlist.fnf \-write_fnf my_netlist2.fnf .fam T .fi .SS KNOWN LIMITATIONS General .RS .IP \(bu 3 No tristate support. .IP \(bu 3 No memory support. .IP \(bu 3 No division or modulo operators. .RE .PP Icarus Verilog FNF Code Generator .RS .IP \(bu 3 Assumes ports and named signals have [n:0] ordering. .IP \(bu 3 "always" blocks are constrained to the Icarus Verilog synthesizable subset. .IP \(bu 3 All register clocks and asynchronous resets must be senitive on the rising edge. WARNING: No errors will be issued if a design contains "negedge". .IP \(bu 3 All arithmetic operations must be unsigned. WARNING: No errors will be issued if a design contains signed operations. .IP \(bu 3 Multipliers can not be embbeded in concatenations. .RE .PP Verilog and VHDL Model Writer .RS .IP \(bu 3 Netlist is flat. .RE .PP NuSMV Model Writer .RS .TP .B - 2-value model. No X's or Z's. .IP \(bu 3 Inputs assumed to init to 0. .IP \(bu 3 Registers are initialized to 0. .SS VERSION 0.10.6 .SS AUTHOR Tom Hawkins .SS SEE ALSO FNF and Confluence : http://www.confluent.org/ .TP .B Icarus Verilog : http://www.icarus.com/eda/verilog/ .TP .B NuSMV : http://nusmv.irst.itc.it/ .SS COPYRIGHT Copyright (C) 2004-2005 Tom Hawkins .RE .PP debian/control0000644000000000000000000000266011331353230010567 0ustar Source: confluence Section: electronics Priority: optional Maintainer: Debian OCaml Maintainers Uploaders: Ralf Treinen , Remi Vanicat , Stefano Zacchiroli , Samuel Mimram , Sylvain Le Gall , Mike Furr Build-Depends: debhelper (>= 5), txt2man, ocaml-nox (>= 3.10) Standards-Version: 3.8.4 Homepage: http://www.confluent.org Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/confluence.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/confluence.git Package: confluence Architecture: any Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends} Recommends: vim-addon-manager Description: language for synchronous reactive hardware system design From the upstream website: . A Confluence program can generate digital logic for an FPGA or ASIC platform, or C code for hard real-time software. . Confluence combines the component-based methodologies of Verilog and VHDL with the expressiveness of higher order functional programming. . In comparison to Verilog, VHDL, and C, systems designed in Confluence result in 2X to 10X code reduction, making the source easier to manage and reuse. And because Confluence relies on a correct-by-construction compiler, bugs are reduced--some are prevented altogether--thus reducing the overall verification effort. debian/copyright0000644000000000000000000000202311331353230011110 0ustar Upstream Author: Tom Hawkins Upstream Homepage: Copyright: Confluence System Design Language Compiler Copyright (C) 2003-2005 Tom Hawkins (tomahawkins@yahoo.com) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the full text of the GNU General Public License can be found in the file /usr/share/common-licenses/GPL debian/source/0000755000000000000000000000000011331353230010460 5ustar debian/source/format0000644000000000000000000000001411331353416011674 0ustar 3.0 (quilt) debian/confluence.install0000644000000000000000000000014511331353230012671 0ustar misc/confluence.vim /usr/share/vim/addons/syntax debian/vim/confluence.yaml /usr/share/vim/registry debian/watch0000644000000000000000000000010311331353230010203 0ustar version=3 http://www.funhdl.org/download/ confluence-(.*)\.tar\.gz debian/patches/0000755000000000000000000000000011331353230010607 5ustar debian/patches/series0000644000000000000000000000001011331353230012013 0ustar config debian/patches/config0000755000000000000000000001100011331353230011772 0ustar Author: Ralf Treinen Description: Install stuff in /usr/share instead of /usr/lib @DPATCH@ --- confluence-0.10.6.orig/lib/base_test/base_test.cf +++ confluence-0.10.6/lib/base_test/base_test.cf @@ -39,7 +39,7 @@ is -ut <- import "$CF_LIB/common/unit_test.cf" +ut <- import "/usr/share/confluence/common/unit_test.cf" {ut.run_test "" "all" suite} --- confluence-0.10.6.orig/src/Makefile +++ confluence-0.10.6/src/Makefile @@ -29,18 +29,21 @@ cf -test .PHONY : install -install : all +install : cf fnf install -D cf $(PREFIX)/bin/cf install -D fnf $(PREFIX)/bin/fnf +.PHONY: install-byte +install-byte: cf.byte fnf.byte + install -D cf.byte $(PREFIX)/bin/cf + install -D fnf.byte $(PREFIX)/bin/fnf + .PHONY : uninstall uninstall : -rm $(PREFIX)/bin/cf -rm $(PREFIX)/bin/fnf CF_CMX=\ - $(OCAMLLIB)/unix.cmxa \ - $(OCAMLLIB)/nums.cmxa \ misc/ut.cmx \ misc/list2.cmx \ misc/string2.cmx \ @@ -81,11 +84,19 @@ fnflib/psl_lexer.cmx \ fnflib/fnf.cmx +CF_CMO = $(CF_CMX:%.cmx=%.cmo) +FNF_CMO = $(FNF_CMX:%.cmx=%.cmo) + cf : $(CF_CMX) - $(OCAMLOPT) -o cf $(OCAMLOPTFLAGS) $(CF_CMX) + $(OCAMLOPT) -o cf $(OCAMLOPTFLAGS) nums.cmxa unix.cmxa $(CF_CMX) +cf.byte: $(CF_CMO) + $(OCAMLC) -o $@ $(OCAMLCFLAGS) nums.cma unix.cma $(CF_CMO) + fnf : $(FNF_CMX) $(OCAMLOPT) -o fnf $(OCAMLOPTFLAGS) $(FNF_CMX) +fnf.byte: $(FNF_CMO) + $(OCAMLC) -o $@ $(OCAMLCFLAGS) $(FNF_CMO) .ml.cmo: $(OCAMLC) $(OCAMLFLAGS) -c $< @@ -98,8 +109,8 @@ clean: -rm depend - -rm cf - -rm fnf + -rm cf cf.byte + -rm fnf fnf.byte -rm cfeval/cfParser.ml -rm cfeval/cfParser.mli -rm cfeval/cfParser.output --- confluence-0.10.6.orig/src/cfeval/cf.ml +++ confluence-0.10.6/src/cfeval/cf.ml @@ -40,7 +40,7 @@ -b filename OR -base_env filename Sets the base environment for the compilation. Overrides the CF_ENV environment variable. If CF_ENV not defined and -base_env option not - set, the base environment defaults to /usr/lib/confluence/base.cf. + set, the base environment defaults to /usr/share/confluence/base.cf. -e integer OR -error_limit integer Sets the maximum number of reported errors. A negative number @@ -131,7 +131,7 @@ done; incr i; CfPrims.set_argv_position !i; - if !base_env = "" then base_env := (try Sys.getenv "CF_ENV" with Not_found -> "/usr/lib/confluence/base.cf"); + if !base_env = "" then base_env := (try Sys.getenv "CF_ENV" with Not_found -> "/usr/share/confluence/base.cf"); CfParserUtil.set_base_env !base_env; !program, !compile_only, !output ;; --- confluence-0.10.6.orig/src/cfeval/cfParserUtil.ml +++ confluence-0.10.6/src/cfeval/cfParserUtil.ml @@ -26,7 +26,7 @@ let top_files = ref [];; let (files : string list ref) = ref [];; -let base_env = ref "/usr/lib/confluence/base.cf";; +let base_env = ref "/usr/share/confluence/base.cf";; let set_base_env file = base_env := file --- confluence-0.10.6.orig/Makefile +++ confluence-0.10.6/Makefile @@ -7,20 +7,23 @@ cd src && $(MAKE) PREFIX=$(PREFIX) .PHONY : install -install : +install: install-cf cd src && $(MAKE) PREFIX=$(PREFIX) install - install -D lib/base.cf $(PREFIX)/lib/confluence/base.cf - install -D lib/list.cf $(PREFIX)/lib/confluence/list.cf - install -D lib/base_test/base_test.cf $(PREFIX)/lib/confluence/base_test/base_test.cf - install -D lib/base_test/run_test $(PREFIX)/lib/confluence/base_test/run_test - install -D lib/common/common.cf $(PREFIX)/lib/confluence/common/common.cf - install -D lib/common/sync.cf $(PREFIX)/lib/confluence/common/sync.cf - install -D lib/common/unit_test.cf $(PREFIX)/lib/confluence/common/unit_test.cf + +.PHONY : install-cf +install-cf: + install -D lib/base.cf $(PREFIX)/share/confluence/base.cf + install -D lib/list.cf $(PREFIX)/share/confluence/list.cf + install -D lib/base_test/base_test.cf $(PREFIX)/share/confluence/base_test/base_test.cf + install -D lib/base_test/run_test $(PREFIX)/share/confluence/base_test/run_test + install -D lib/common/common.cf $(PREFIX)/share/confluence/common/common.cf + install -D lib/common/sync.cf $(PREFIX)/share/confluence/common/sync.cf + install -D lib/common/unit_test.cf $(PREFIX)/share/confluence/common/unit_test.cf .PHONY : uninstall uninstall : cd src && $(MAKE) PREFIX=$(PREFIX) uninstall - -rm -r $(PREFIX)/lib/confluence + -rm -r $(PREFIX)/share/confluence .PHONY : clean clean : debian/vim/0000755000000000000000000000000011331353230007753 5ustar debian/vim/confluence.yaml0000644000000000000000000000014011331353230012753 0ustar addon: confluence description: "highlight Confluence programs" files: - syntax/confluence.vim debian/compat0000644000000000000000000000000211331353230010356 0ustar 5 debian/docs0000644000000000000000000000004311331353230010030 0ustar NEWS src/doc/ debian/README.Debian debian/dirs0000644000000000000000000000006511331353230010045 0ustar /usr/share/vim/addons/syntax /usr/share/vim/registry