From 25744501096d17718e3875f9e7488e2941243683 Mon Sep 17 00:00:00 2001 From: Julia Longtin Date: Sun, 26 Jan 2020 17:57:49 +0000 Subject: [PATCH] shorten synopsis and description. --- Makefile | 12 +++++++++--- implicit.cabal | 15 ++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index d922eb10..7c830ff0 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,10 @@ GHC=ghc GHCVERSION=$(shell ${GHC} --version | sed "s/.*version //") IMPLICITVERSION=$(shell cat implicit.cabal | sed -n "s/Version[: ]*\([0-9]*.*\)/\1/p") ARCHITECTURE=$(shell uname -m | sed "s/i[3-6]86/i386/" ) +# FIXME: detect this on other OSes. +OS=linux # new-style location root. must NOT have trailing slash -BUILDROOT=dist-newstyle/build/${ARCHITECTURE}-linux/ghc-${GHCVERSION}/implicit-${IMPLICITVERSION} +BUILDROOT=dist-newstyle/build/${ARCHITECTURE}-${OS}/ghc-${GHCVERSION}/implicit-${IMPLICITVERSION} EXEBUILDROOT=${BUILDROOT}/x/ TESTBUILDROOT=${BUILDROOT}/t/ BENCHBUILDROOT=${BUILDROOT}/b/ @@ -105,8 +107,8 @@ clean: rm -f Examples/example*.cachegrind.* rm -f tests/*.stl rm -rf docs/parser.md - rm -f $(TARGETS) - rm -f $(LIBBUILDS) + rm -f ${TARGETS} + rm -f ${LIBBUILDS} rm -f benchmarks rm -rf ${EXECBUILDDIRS} ${PARSERBENCHDIR} ${TESTSUITEDIR} rm -f ${BUILDROOT}/build/libHS* @@ -116,7 +118,11 @@ clean: distclean: clean Setup ./Setup clean rm -f Setup Setup.hi Setup.o + rm -rf dist rm -rf dist-newstyle + rm -rf .stack-work + rm -f cabal.project.local + rm .ghc.environment.${ARCHITECTURE}-${OS}-${GHCVERSION} rm -f `find ./ -name "*~"` rm -f `find ./ -name "\#*\#"` diff --git a/implicit.cabal b/implicit.cabal index 3fc06aa1..20eefdda 100644 --- a/implicit.cabal +++ b/implicit.cabal @@ -1,17 +1,14 @@ Name: implicit -Version: 0.2.1 +Version: 0.3.0.0 Cabal-version: >= 1.10 -Tested-with: GHC >= 8.2 +Tested-with: GHC >= 8.6 Build-type: Simple -Synopsis: A Math-inspired programmatic 2&3D CAD system: CSG, bevels, and shells; gcode export.. -Description: A math-inspired programmatic CAD library in haskell. - Build objects with constructive solid geometry, bevels, - shells and more in 2D & 3D. Then export to SVGs, STLs, - or produce gcode directly! +Synopsis: A math-inspired programmatic 2D & 3D CAD system. +Description: An OpenSCAD execution engine for generating models in STL and many other formats. License: AGPL-3 License-file: LICENSE -Author: Julia Longtin -Maintainer: Julia Longtin +Author: Julia Longtin +Maintainer: Julia Longtin Homepage: http://implicitcad.org/ Category: Graphics