Updating: reorganizing PATSHOME/npm-utils/contrib/atscntrb

doc/DISTRIB/ATEXT/atslib_atscntrb.atxt → doc/DISTRIB/ATEXT/contrib_atscntrb.atxt

@@ -54,8 +54,8 @@ fprint_string(out, "\
 # This script is automatically generated.\n\
 #\n\
 \n\
-SOURCE=./../../contrib\n\
-TARGET=ATS-Postiats/contrib\n\
+SOURCE=./../../contrib/atscntrb\n\
+TARGET=ATS-Postiats/contrib/atscntrb\n\
 \n\
 srcget()\n\
 {\n\
@@ -144,51 +144,61 @@ packfilesynop(x) = atext_nil()
 (* ****** ****** *)
 
 #packfilename(
-"atscntrb-libgmp/README.md"
+"atscntrb-hx-libgmp/README.md"
 )
 #packfilename(
-"atscntrb-libgmp/mylibies.hats"
+"atscntrb-hx-libgmp/mylibies.hats"
 )
-#packfilename_r("atscntrb-libgmp/CATS")
-#packfilename_r("atscntrb-libgmp/SATS")
-#packfilename_r("atscntrb-libgmp/DATS")
-#packfilename_r("atscntrb-libgmp/TEST")
+#packfilename_r("atscntrb-hx-libgmp/CATS")
+#packfilename_r("atscntrb-hx-libgmp/SATS")
+#packfilename_r("atscntrb-hx-libgmp/DATS")
+#packfilename_r("atscntrb-hx-libgmp/TEST")
 
 (* ****** ****** *)
 
 #packfilename(
-"atscntrb-libpcre/mylibies.hats"
+"atscntrb-hx-libpcre/mylibies.hats"
 )
 #packfilename(
-"atscntrb-libpcre/mylibies_link.hats"
+"atscntrb-hx-libpcre/mylibies_link.hats"
 )
-#packfilename_r("atscntrb-libpcre/CATS")
-#packfilename_r("atscntrb-libpcre/SATS")
-#packfilename_r("atscntrb-libpcre/DATS")
-#packfilename_r("atscntrb-libpcre/TEST")
+#packfilename_r("atscntrb-hx-libpcre/CATS")
+#packfilename_r("atscntrb-hx-libpcre/SATS")
+#packfilename_r("atscntrb-hx-libpcre/DATS")
+#packfilename_r("atscntrb-hx-libpcre/TEST")
 
 (* ****** ****** *)
 
 #packfilename(
-"atscntrb-libcurl/mylibies.hats"
+"atscntrb-hx-libcurl/mylibies.hats"
 )
-#packfilename_r("atscntrb-libcurl/CATS")
-#packfilename_r("atscntrb-libcurl/SATS")
-#packfilename_r("atscntrb-libcurl/DATS")
-#packfilename_r("atscntrb-libcurl/TEST")
+#packfilename_r("atscntrb-hx-libcurl/CATS")
+#packfilename_r("atscntrb-hx-libcurl/SATS")
+#packfilename_r("atscntrb-hx-libcurl/DATS")
+#packfilename_r("atscntrb-hx-libcurl/TEST")
 
 (* ****** ****** *)
 
 #packfilename(
-"atscntrb-libjson-c/mylibies.hats"
+"atscntrb-hx-libjson-c/mylibies.hats"
 )
 #packfilename(
-"atscntrb-libjson-c/mylibies_link.hats"
+"atscntrb-hx-libjson-c/mylibies_link.hats"
 )
-#packfilename_r("atscntrb-libjson-c/CATS")
-#packfilename_r("atscntrb-libjson-c/SATS")
-#packfilename_r("atscntrb-libjson-c/DATS")
-#packfilename_r("atscntrb-libjson-c/TEST")
+#packfilename_r("atscntrb-hx-libjson-c/CATS")
+#packfilename_r("atscntrb-hx-libjson-c/SATS")
+#packfilename_r("atscntrb-hx-libjson-c/DATS")
+#packfilename_r("atscntrb-hx-libjson-c/TEST")
+
+(* ****** ****** *)
+
+#packfilename(
+"atscntrb-hx-libjansson/mylibies.hats"
+)
+#packfilename_r("atscntrb-hx-libjansson/CATS")
+#packfilename_r("atscntrb-hx-libjansson/SATS")
+#packfilename_r("atscntrb-hx-libjansson/DATS")
+#packfilename_r("atscntrb-hx-libjansson/TEST")
 
 (* ****** ****** *)
 
@@ -249,19 +259,13 @@ packfilesynop(x) = atext_nil()
 (* ****** ****** *)
 
 #packfilename(
-"atscntrb-sdstring/README.md"
+"atscntrb-hx-sdstring/README.md"
 )
-#packfilename_r("atscntrb-sdstring/H")
-#packfilename_r("atscntrb-sdstring/CATS")
-#packfilename_r("atscntrb-sdstring/SATS")
-#packfilename_r("atscntrb-sdstring/DATS")
-#packfilename_r("atscntrb-sdstring/TEST")
-
-(* ****** ****** *)
-
-#packfilename_r("atscntrb-smt-libz3/CATS")
-#packfilename_r("atscntrb-smt-libz3/SATS")
-#packfilename_r("atscntrb-smt-libz3/TEST")
+#packfilename_r("atscntrb-hx-sdstring/H")
+#packfilename_r("atscntrb-hx-sdstring/CATS")
+#packfilename_r("atscntrb-hx-sdstring/SATS")
+#packfilename_r("atscntrb-hx-sdstring/DATS")
+#packfilename_r("atscntrb-hx-sdstring/TEST")
 
 (* ****** ****** *)
 
@@ -277,4 +281,4 @@ implement main() = () where { }
 
 (* ****** ****** *)
 
-(* end of [atslib_atscntrb.atxt] *)
+(* end of [contrib_atscntrb.atxt] *)

doc/DISTRIB/ATEXT/npm_utils_contrib_atscntrb.atxt

@@ -150,19 +150,11 @@ packfilesynop(x) = atext_nil((*void*))
 (* ****** ****** *)
 
 #packtitle("\
-PATSHOME/npm-utils/contrib\
+PATSHOME/npm-utils/contrib/atscntrb\
 ")
 
 (* ****** ****** *)
 
-#packfilename_r("atscntrb-libsdl2")
-
-(* ****** ****** *)
-
-#packfilename_r("atscntrb-libcairo")
-
-(* ****** ****** *)
-
 #packpostamble()
 
 (* ****** ****** *)

doc/DISTRIB/Makefile

@@ -73,6 +73,29 @@ cleanall:: ; $(RMF) HTML/patsopt_src_cboot.html
 cleanall:: ; $(RMF) SCRIPT/patsopt_src_cboot.bash
 
 
+######
+
+all_script:: \
+SCRIPT/ccomp_atslib.bash
+SCRIPT/ccomp_atslib.bash: ccomp_atslib_atxt.exe ; ./$< > $@
+ccomp_atslib_atxt.dats: ATEXT/ccomp_atslib.atxt ; \
+  $(CAT) $< | $(ATSDOC) --prefix __datatok --outcode $@ > /dev/null
+ccomp_atslib_atxt.exe: ccomp_atslib_atxt.dats ; $(ATSCC) $(INCLATS) $(GCFLAG) -o $@ $< -latsdoc
+clean:: ; $(RMF) ccomp_atslib_atxt.exe
+cleanall:: ; $(RMF) HTML/ccomp_atslib.html
+cleanall:: ; $(RMF) SCRIPT/ccomp_atslib.bash
+
+all_script:: \
+SCRIPT/ccomp_runtime.bash
+SCRIPT/ccomp_runtime.bash: ccomp_runtime_atxt.exe ; ./$< > $@
+ccomp_runtime_atxt.dats: ATEXT/ccomp_runtime.atxt ; \
+  $(CAT) $< | $(ATSDOC) --prefix __datatok --outcode $@ > /dev/null
+ccomp_runtime_atxt.exe: ccomp_runtime_atxt.dats ; $(ATSCC) $(INCLATS) $(GCFLAG) -o $@ $< -latsdoc
+clean:: ; $(RMF) ccomp_runtime_atxt.exe
+cleanall:: ; $(RMF) HTML/ccomp_runtime.html
+cleanall:: ; $(RMF) SCRIPT/ccomp_runtime.bash
+
+
 ######
 
 all_script:: \
@@ -152,41 +175,18 @@ cleanall:: ; $(RMF) SCRIPT/atslib_libats_BUCS320.bash
 ######
 #
 all_script:: \
-SCRIPT/atslib_atscntrb.bash
-SCRIPT/atslib_atscntrb.bash: atslib_atscntrb_atxt.exe ; ./$< > $@
-atslib_atscntrb_atxt.dats: ATEXT/atslib_atscntrb.atxt ; \
+SCRIPT/contrib_atscntrb.bash
+SCRIPT/contrib_atscntrb.bash: contrib_atscntrb_atxt.exe ; ./$< > $@
+contrib_atscntrb_atxt.dats: ATEXT/contrib_atscntrb.atxt ; \
   $(CAT) $< | $(ATSDOC) --prefix __datatok --outcode $@ > /dev/null
-atslib_atscntrb_atxt.exe: atslib_atscntrb_atxt.dats ; $(ATSCC) $(INCLATS) $(GCFLAG) -o $@ $< -latsdoc
-clean:: ; $(RMF) atslib_atscntrb_atxt.exe
-cleanall:: ; $(RMF) HTML/atslib_atscntrb.html
-cleanall:: ; $(RMF) SCRIPT/atslib_atscntrb.bash
+contrib_atscntrb_atxt.exe: contrib_atscntrb_atxt.dats ; $(ATSCC) $(INCLATS) $(GCFLAG) -o $@ $< -latsdoc
+clean:: ; $(RMF) contrib_atscntrb_atxt.exe
+cleanall:: ; $(RMF) HTML/contrib_atscntrb.html
+cleanall:: ; $(RMF) SCRIPT/contrib_atscntrb.bash
 
 #
 ######
 
-all_script:: \
-SCRIPT/ccomp_atslib.bash
-SCRIPT/ccomp_atslib.bash: ccomp_atslib_atxt.exe ; ./$< > $@
-ccomp_atslib_atxt.dats: ATEXT/ccomp_atslib.atxt ; \
-  $(CAT) $< | $(ATSDOC) --prefix __datatok --outcode $@ > /dev/null
-ccomp_atslib_atxt.exe: ccomp_atslib_atxt.dats ; $(ATSCC) $(INCLATS) $(GCFLAG) -o $@ $< -latsdoc
-clean:: ; $(RMF) ccomp_atslib_atxt.exe
-cleanall:: ; $(RMF) HTML/ccomp_atslib.html
-cleanall:: ; $(RMF) SCRIPT/ccomp_atslib.bash
-
-all_script:: \
-SCRIPT/ccomp_runtime.bash
-SCRIPT/ccomp_runtime.bash: ccomp_runtime_atxt.exe ; ./$< > $@
-ccomp_runtime_atxt.dats: ATEXT/ccomp_runtime.atxt ; \
-  $(CAT) $< | $(ATSDOC) --prefix __datatok --outcode $@ > /dev/null
-ccomp_runtime_atxt.exe: ccomp_runtime_atxt.dats ; $(ATSCC) $(INCLATS) $(GCFLAG) -o $@ $< -latsdoc
-clean:: ; $(RMF) ccomp_runtime_atxt.exe
-cleanall:: ; $(RMF) HTML/ccomp_runtime.html
-cleanall:: ; $(RMF) SCRIPT/ccomp_runtime.bash
-
-
-######
-
 all_script:: \
 SCRIPT/utils_emacs.bash
 SCRIPT/utils_emacs.bash: utils_emacs_atxt.exe ; ./$< > $@
@@ -640,12 +640,12 @@ atspackaging:: srcget_share
 atspackaging:: srcget_patsrc
 atspackaging:: srcget_patsrc_cboot
 #
-atspackaging:: srcget_atslib
-atspackaging:: srcget_atslib_atscntrb
-#
 atspackaging:: srcget_ccomp_atslib
 atspackaging:: srcget_ccomp_runtime
 #
+atspackaging:: srcget_atslib
+atspackaging:: srcget_contrib_atscntrb
+#
 atspackaging:: srcget_utils_emacs
 atspackaging:: srcget_utils_atscc
 atspackaging:: srcget_utils_myatscc
@@ -751,7 +751,7 @@ srcget_atslib_libats_ATS2:: SCRIPT/atslib_libats_ATS2.bash ; bash $<
 srcget_atslib:: srcget_atslib_libats_BUCS320
 srcget_atslib_libats_BUCS320:: SCRIPT/atslib_libats_BUCS320.bash ; bash $<
 #
-srcget_atslib_atscntrb:: SCRIPT/atslib_atscntrb.bash ; bash $<
+srcget_contrib_atscntrb:: SCRIPT/contrib_atscntrb.bash ; bash $<
 #
 ######
 

doc/DISTRIB/Makefile.atxt

@@ -100,6 +100,11 @@ all_script::
 
 ######
 
+#make_entry("ccomp_atslib")
+#make_entry("ccomp_runtime")
+
+######
+
 #make_entry("atslib_prelude")
 
 ######
@@ -113,15 +118,10 @@ all_script::
 
 ######
 #
-#make_entry("atslib_atscntrb")
+#make_entry("contrib_atscntrb")
 #
 ######
 
-#make_entry("ccomp_atslib")
-#make_entry("ccomp_runtime")
-
-######
-
 #make_entry("utils_emacs")
 #make_entry("utils_atscc")
 #make_entry("utils_myatscc")
@@ -206,12 +206,12 @@ atspackaging:: srcget_share
 atspackaging:: srcget_patsrc
 atspackaging:: srcget_patsrc_cboot
 #
-atspackaging:: srcget_atslib
-atspackaging:: srcget_atslib_atscntrb
-#
 atspackaging:: srcget_ccomp_atslib
 atspackaging:: srcget_ccomp_runtime
 #
+atspackaging:: srcget_atslib
+atspackaging:: srcget_contrib_atscntrb
+#
 atspackaging:: srcget_utils_emacs
 atspackaging:: srcget_utils_atscc
 atspackaging:: srcget_utils_myatscc
@@ -317,7 +317,7 @@ srcget_atslib_libats_ATS2:: SCRIPT/atslib_libats_ATS2.bash ; bash $<
 srcget_atslib:: srcget_atslib_libats_BUCS320
 srcget_atslib_libats_BUCS320:: SCRIPT/atslib_libats_BUCS320.bash ; bash $<
 #
-srcget_atslib_atscntrb:: SCRIPT/atslib_atscntrb.bash ; bash $<
+srcget_contrib_atscntrb:: SCRIPT/contrib_atscntrb.bash ; bash $<
 #
 ######
 

npm-utils/contrib/atscntrb-libcairo/SATS/cairo.sats → npm-utils/contrib/atscntrb/atscntrb-hx-libcairo/SATS/cairo.sats

@@ -39,7 +39,7 @@
 
 %{#
 #include \
-"atscntrb-libcairo/CATS/cairo.cats"
+"atscntrb-hx-libcairo/CATS/cairo.cats"
 %} // end of [%{#]
 
 (* ****** ****** *)

npm-utils/contrib/atscntrb-libcairo/TUTORIAL/CODE/illucircmot.dats → npm-utils/contrib/atscntrb/atscntrb-hx-libcairo/TUTORIAL/CODE/illucircmot.dats

@@ -48,13 +48,6 @@
 ** Ported to ATS2 by Hongwei Xi, September, 2013
 *)
 
-(* ****** ****** *)
-//
-#define
-LIBCAIRO_targetloc
-"$PATSHOME/npm-utils\
-/contrib/atscntrb-libcairo"
-//
 (* ****** ****** *)
 //
 #include
@@ -68,9 +61,20 @@ staload _(*anon*) =
 "libats/libc/DATS/math.dats"
 //
 (* ****** ****** *)
-
-staload "{$LIBCAIRO}/SATS/cairo.sats"
-
+//
+#define
+LIBCAIRO_targetloc
+"\
+$PATSHOME/\
+npm-utils/contrib\
+/atscntrb/atscntrb-hx-libcairo"
+//
+(* ****** ****** *)
+//
+#include
+"{$LIBCAIRO}/mylibies.hats"
+#staload $CAIRO // opening it!
+//
 (* ****** ****** *)
 
 macdef PI = M_PI