Merge pull request souffle-lang#370 from mmcgr/version

Preparation for 1.1 release

README.md

@@ -44,7 +44,11 @@ There is no mailing list to talk about Soufflé at the moment. It will be establ
 
 Follow the steps below to compile and install Soufflé on a UNIX system:
 
-1.  G++ 4.8 or greater is recommended to compile Soufflé. 
+1.  Install the needed dependencies. G++ 4.8 or greater is recommended to compile Soufflé. openjdk-7 can be used if openjdk-8 is not available on your platform.
+
+```
+sudo apt-get install autoconf automake bison build-essential doxygen flex g++ git libsqlite3-dev libtool make openjdk-8-jdk pkg-config python zlib1g-dev
+```
 
 2.  Run `sh ./bootstrap` to generate configure files 
 

debian/changelog.in

@@ -1,5 +1,20 @@
 souffle (@VERSION@-1) UNRELEASED; urgency=low
 
+  * Configurable I/O System with more options and support for new language
+    extensions (mmcgr).
+  * Support of equivalence relation using union/find data-structures (pnappa)
+  * New profiling tool rewritten in C++ with HTML/Javascript output
+    (DominicRomanowski).
+  * Replacing the Boost C-prepocessor wave by mcpp (pnappa)
+  * Adding ternary functors (b-scholz)
+  * JNI interface (psubotic)
+  * Memory optimisations (lyndonhenry)
+  * Numerous bug fixes. 
+
+ -- Kostyantyn Vorobyov <k.a.vorobyov@gmail.com>  Wed, 29 Mar 2017 12:00:23 +1100
+
+souffle (1.0.0); urgency=low
+
   * Initial release
 
  -- Kostyantyn Vorobyov <k.a.vorobyov@gmail.com>  Mon, 21 Mar 2016 17:25:32 +0000

debian/control

@@ -3,17 +3,17 @@ Maintainer: Kostyantyn Vorobyov <k.a.vorobyov@gmail.com>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), libsqlite3-dev, openjdk-7-jdk | openjdk-8-jdk
+Build-Depends: autoconf, automake, bison, debhelper (>= 9), flex, libsqlite3-dev, openjdk-7-jdk | openjdk-8-jdk, zlib1g-dev
 Homepage: https://github.com/oracle/souffle
 Vcs-Git: https://github.com/souffle-lang/souffle.git
 
 Package: souffle
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, g++, jarwrapper,libsqlite3-dev, openjdk-7-jre | openjdk-8-jre
+Depends: ${shlibs:Depends}, ${misc:Depends}, g++, jarwrapper, openjdk-7-jre | openjdk-8-jre
 Description: Translator of declarative Datalog programs into the C++ language.
  Soufflé is a translator of declarative Datalog programs into the C++ language.
  Soufflé is used as a domain-specific language for static program analysis, over
- large code bases with millions of lines of code. Soufflé aims at producing
+ large code bases with millions of lines of code. Soufflé aims to produce
  high-performance C++ code that can be compiled with the native compiler on
  the target machine.
 

debian/copyright

@@ -1,4 +1,4 @@
-Copyright (c) 2013, 2014, Oracle and/or its affiliates. All Rights reserved
+Copyright (c) 2016 Oracle and/or its affiliates. All Rights reserved
 
 The Universal Permissive License (UPL), Version 1.0
 

man/souffle-compile.1

@@ -1,9 +1,9 @@
-.TH SOUFFLE-COMPILE 1 2016-03-25
+.TH SOUFFLE-COMPILE 1 2017-03-30
 
 .SH NAME
-.B souffle-compile - short description of souffle-compile
-.SH SYNOPSIS
 .B souffle-compile
+.SH SYNOPSIS
+.B Compile a C++ source file generated by souffle
 [
 .I options
 ]
@@ -12,22 +12,24 @@
 .B Long description of souffle-compile
 .SH OPTIONS
 .TP
-.B -h, --help
-show a help page.
+.B -h
+show usage.
+.B  -s
+compile a program with OpenMP support
+.TP
+.B  -v
+verbose output
+.TP
+.B  -w
+enable warnings
 .TP
-
 .SH EXAMPLES
-
-.B souffle-compile ...
-
+souffle-compile [options] <FILE>.cpp
 .SH VERSION
-
-1.0
+1.1
 
 .SH LICENSE
-
-Copyright (c) 2013, 2015, Oracle and/or its affiliates.
-All rights reserved.
+Copyright (c) 2016 Oracle and/or its affiliates. All Rights reserved.
 
 .SH SEE ALSO
 \fBg++\fP(1), \fBjava\fP(1)

man/souffle-config.1

@@ -1,4 +1,4 @@
-.TH SOUFFLE-CONFIG 1 2016-03-25
+.TH SOUFFLE-CONFIG 1 2017-03-30
 
 .SH NAME
 .B souffle-config - short description of souffle-config
@@ -12,22 +12,19 @@
 .B Long description of souffle-config
 .SH OPTIONS
 .TP
-.B -h, --help
+.B -h
 show a help page.
 .TP
-
-.SH EXAMPLES
-
-.B souffle-config ...
+.B -l
+list the libraries needed to compile with souffle.
+.TP
 
 .SH VERSION
 
-1.0
+1.1
 
 .SH LICENSE
-
-Copyright (c) 2013, 2015, Oracle and/or its affiliates.
-All rights reserved.
+Copyright (c) 2016 Oracle and/or its affiliates. All Rights reserved.
 
 .SH SEE ALSO
 \fBg++\fP(1), \fBjava\fP(1)

man/souffle-profile.1

@@ -1,4 +1,4 @@
-.TH SOUFFLE-PROFILE 1 2016-03-25
+.TH SOUFFLE-PROFILE 1 2017-03-30
 
 .SH NAME
 .B souffle-profile 
@@ -20,29 +20,27 @@ generated by Souffle programs that were are compiled with the
 option -p. 
 .SH OPTIONS
 .TP
-.B -h, --help
+.B -h
 show a help page.
 .TP
-.B -f\fI<filename>\fP
-specifies the profile filename
+.B -v
+print the profiler version
 .TP
 .B -c\fI<command>\fP
 executes the command and terminates the profiler after execution.
-If no command is specief, the interactive mode is enabled. 
+Run -c "help" for a list of profiler commands.
 .B -l 
 enable profiling of a running program 
 .SH EXAMPLES
 
-.B souffle-profile -f prof.log
+.B souffle-profile -v | -h | <log-file> [ -c <command> | -j | -l ]
 
 .SH VERSION
 
-1.0
+1.1
 
 .SH LICENSE
-
-Copyright (c) 2013, 2015, Oracle and/or its affiliates.
-All rights reserved.
+Copyright (c) 2016 Oracle and/or its affiliates. All Rights reserved.
 
 .SH SEE ALSO
 \fBg++\fP(1), \fBjava\fP(1)

man/souffle.1

@@ -1,4 +1,4 @@
-.TH SOUFFLE 1 2016-03-25
+.TH SOUFFLE 1 2017-03-30
 
 .SH NAME
 .B souffle
@@ -10,8 +10,8 @@
 ]
 .I files
 .SH DESCRIPTION
-Souffle is used as a domain-specific language for static program analysis, over
-large code bases with millions of lines of code. Souffle aims at producing
+Souffle is used as a domain-specific language for static program analysis over
+large code bases with millions of lines of code. Souffle aims to produce
 high-performance C++ code that can be compiled with the native compiler on the
 target machine.
 .SH OPTIONS
@@ -25,12 +25,8 @@ verbose output
 .B -F\fI<DIR>\fP, --fact-dir=\fI<DIR>\fP
 specify directory for fact files
 .TP
-.TP
-.B -I\fI<DIR>\fP, --include-dir=\fI<DIR>\fP
-specify directory for include files
-.TP
-.B -D\fI<DIR>\fP, --output-dir-dir=\fI<DIR>\fP
-Specify directory for output relations (if \fI<DIR>\fP is -, output is written to stdout)
+.B -D\fI<DIR>\fP, --output-dir=\fI<DIR>\fP
+Specify directory for output relations (if \fI<DIR>\fP is -, all output is written to stdout)
 .TP
 .B -j\fI<N>\fP, --jobs=\fI<N>\fP
 run interpreter/compiler in parallel using N threads, N=auto for system default
@@ -55,8 +51,8 @@ write debugging output to HTML report
 .SH EXAMPLES
 souffle program.dl
 .SH VERSION
-1.0
+1.1
 .SH LICENSE
-Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2016 Oracle and/or its affiliates. All Rights reserved.
 .SH SEE ALSO
 \fBg++\fP(1), \fBjava\fP(1)

src/CompiledRamOptions.h

@@ -241,7 +241,7 @@ class CmdOptions {
 #endif
         std::cerr << "    -h                           -- prints this help page.\n";
         std::cerr << "--------------------------------------------------------------------\n";
-        std::cerr << " Copyright (c) 2013, 2015, Oracle and/or its affiliates.\n";
+        std::cerr << " Copyright (c) 2016 Oracle and/or its affiliates.\n";
         std::cerr << " All rights reserved.\n";
         std::cerr << "====================================================================\n";
     }

src/Global.cpp

@@ -150,10 +150,10 @@ void MainConfig::processArgs(int argc, char** argv, const std::string header, co
     }
 
     // obtain the name of the datalog file, and store it in the option with the empty key
-    {
+    if (argc > 1 && !Global::config().has("help")) {
         std::string filename = "";
         // ensure that the optind is less than the total number of arguments
-        if (optind >= argc) {
+        if (argc > 1 && optind >= argc) {
             ERROR("unexpected command line argument", []() { std::cerr << Global::config().help(); });
         }
         // if only one datalog program is allowed

src/main.cpp

@@ -85,7 +85,7 @@ int main(int argc, char** argv) {
                     footer << "Version: " << PACKAGE_VERSION << "" << std::endl;
                     footer << "----------------------------------------------------------------------------"
                            << std::endl;
-                    footer << "Copyright (c) 2013, 2015, Oracle and/or its affiliates." << std::endl;
+                    footer << "Copyright (c) 2016 Oracle and/or its affiliates." << std::endl;
                     footer << "All rights reserved." << std::endl;
                     footer << "============================================================================"
                            << std::endl;
@@ -95,7 +95,7 @@ int main(int argc, char** argv) {
                 // the empty string if they take none
                 []() {
                     MainOption opts[] = {
-                            {"", 0, "", "-unknown-", false,
+                            {"", 0, "", "", false,
                                     ""},  // main option, the datalog program itself, key is always empty
                             {"fact-dir", 'F', "DIR", ".", false, "Specify directory for fact files."},
                             {"include-dir", 'I', "DIR", ".", true, "Specify directory for include files."},
@@ -126,13 +126,13 @@ int main(int argc, char** argv) {
         // ------ command line arguments -------------
 
         /* for the help option, if given simply print the help text then exit */
-        if (Global::config().has("help")) {
+        if (!Global::config().has("") || Global::config().has("help")) {
             std::cerr << Global::config().help();
             return 0;
         }
 
         /* check that datalog program exists */
-        if (!Global::config().has("") || !existFile(Global::config().get(""))) {
+        if (!existFile(Global::config().get(""))) {
             ERROR("cannot open file " + std::string(Global::config().get("")));
         }