Merge branch 'master' into perl2py.

Makefile.in

@@ -176,8 +176,8 @@ $(LSP_BUILD_ROOT)/liblspcpp.a:
 all:	asy sty man faq asy-keywords.el
 
 $(GCLIB):
-	ln -sf ../libatomic_ops libatomic_ops
-	cd $(GC) && ./configure CC="$(CC)" CXX="$(CXX)" $(GCOPTIONS)
+	cd $(GC) && ln -sf ../libatomic_ops . && \
+		./configure CC="$(CC)" CXX="$(CXX)" $(GCOPTIONS)
 	$(MAKE) -C $(GC) check
 
 sty: doc/version.texi
@@ -367,18 +367,23 @@ uninstall-docdir:
 
 clean:	FORCE
 	-rm -f asy asymptote.so *.pic.o *.o *.d *.raw.i *mon.out $(CLEAN)
-	-rm -f LspCpp/liblspcpp.a LspCpp/Makefile LspCpp/CMakeFiles
 	-cd LspCpp && $(MAKE) distclean
+	-cd LspCpp && rm -rf liblspcpp.a Makefile CMakeFiles third_party/uri/src/CMakeFiles
 	-cd tinyexr && $(MAKE) clean
 	-cd GUI && $(PYTHON) buildtool.py clean
 
 gc-clean: FORCE clean
 	-$(MAKE) -C $(GC) clean
 
 cleaner: FORCE clean
+	-rm -rf __pycache__
+	-rm -rf GUI/__pycache__
+	-rm -rf GUI/pyUIClass/__pycache__
+	-rm -rf GUI/configs/__pycache__
 	-$(MAKE) -C $(GC) distclean
+	-cd $(GC) && rm -rf libatomic_ops .deps cord/.deps cord/tests/.deps extra/.deps tests/.deps
 	-rm -f Makefile config.h config.log config.status errors.temp
-	-rm -f LspCpp/CMakeCache.txt
+	-rm -rf LspCpp/CMakeCache.txt
 	cd doc && $(MAKE) clean
 	cd tests && $(MAKE) distclean
 

asymptote.spec

@@ -3,7 +3,7 @@
 %global __python %{__python3}
 
 Name:           asymptote
-Version:        2.96
+Version:        2.97
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 

build-scripts/build-asymptote-CTAN

@@ -19,6 +19,7 @@ SRC=/usr/local/src/asymptote-$VERSION.src.tgz
 rm -rf asymptote-$VERSION
 tar -zxf $SRC
 cd asymptote-$VERSION
+find . -name ".[^.]*" -exec rm -rf {} \;
 mkdir -p binaries/$BINDIR/texlive
 cd binaries/$BINDIR
 cp $SHARED/CTAN/asy.exe texlive

configure.ac

@@ -3,7 +3,7 @@
 # this file.
 
 AC_PREREQ([2.71])
-AC_INIT([Asymptote],[2.96git],[https://github.com/vectorgraphics/asymptote/issues])
+AC_INIT([Asymptote],[2.97git],[https://github.com/vectorgraphics/asymptote/issues])
 VERSION=$PACKAGE_VERSION
 AC_SUBST(VERSION)
 m4_include([ax_pthread.m4])
@@ -27,7 +27,7 @@ AC_ARG_ENABLE(lsp,
 [AS_HELP_STRING(--enable-lsp[[[=yes]]],enable Language Server Protocol)])
 cxxstd="c++17"
 
-CXXFLAGS += "-std=$cxxstd"
+CXXFLAGS=$CXXFLAGS" -std=$cxxstd"
 
 test "$CFLAGS" || CFLAGS="-g -O3"
 

entry.h

@@ -390,7 +390,7 @@ class venv {
   // record (if any) becomes available.
   mem::list<mem::pair<symbol, varEntry *>> autoUnravels;
   mem::unordered_map<mem::pair<symbol, ty*>,
-                     nullptr_t,
+                     std::nullptr_t,
                      SigHash,
                      SigEquiv> nonShadowableAutoUnravels;
 

fileio.cc

@@ -421,6 +421,8 @@ void iofile::writeline()
   if(errorstream::interrupt) throw interrupted();
 }
 
+#ifdef HAVE_LIBTIRPC
+
 void igzxfile::open()
 {
   name=locatefile(inpath(name));
@@ -447,5 +449,6 @@ void igzxfile::closeFile()
     processData().ixfile.remove(index);
   }
 }
+#endif
 
 } // namespace camp

prc/writePRC.cc

@@ -1375,7 +1375,7 @@ void  PRCCompressedFace::serializeCompressedNurbs(PRCbitStream &pbs, double brep
    for(uint32_t i=0;i<number_of_control_point_in_u;i++)
    for(uint32_t j=0;j<number_of_control_point_in_v;j++)
       P[i][j] = control_point[i*number_of_control_point_in_v+j];
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__clang__)
    itriple compressed_control_point[number_of_control_point_in_u][number_of_control_point_in_v];
    uint32_t control_point_type[number_of_control_point_in_u][number_of_control_point_in_v];
 #else

runtime.pl

@@ -302,9 +302,13 @@ sub c_params {
 push @header, "}\n\n";
 
 undef $/;
-open my $HEADER, "<", $outHeaderFile;
-my $orig_header = <$HEADER>;
-close $HEADER;
+my $orig_header = "";
+my $HEADER;
+if (-e $outHeaderFile) {
+    open $HEADER, "<", $outHeaderFile;
+    $orig_header = <$HEADER>;
+    close $HEADER;
+}
 
 my $new_header = join "", @header;
 if ($new_header ne $orig_header) {