diff --git a/README.md b/README.md index 649bff6..cecf234 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Don't forget to **STAR** (:star:) the repository! :-) ### Current version: -**The latest version** of SPF is **`20240927`**. +**The latest version** of SPF is **`20241014`**. To get started with SAS Packages try this [**`Getting Started with SAS Packages`**](https://github.com/yabwon/SAS_PACKAGES/blob/main/SPF/Documentation/Getting_Started_with_SAS_Packages.pdf "Getting Started with SAS Packages") presentation (see the `./SPF/Documentation` directory). @@ -163,6 +163,8 @@ The SAS Packages Framework [(short) documentation](https://github.com/yabwon/SAS ### Updates worth mentioning: +**Update**\[October 14th, 2024\]**:** `DS2PCK` and `DS2THR` **types for `PROC DS2` *threads* and *packages* added to the framework. (see [here](https://github.com/yabwon/SAS_PACKAGES/releases/tag/20241014 "PROC DS2"))**. + **Update**\[December 10th, 2023\]**:** `markdownDoc=` **parameter added to** `%generatePackage()` **macro, which allows to generate markdown file with documentation. Content is taken from the help information notes and the description. (see [here](https://github.com/yabwon/SAS_PACKAGES/releases/tag/20231210 "markdown documentation"))**. **Update**\[November 11th, 2023\]**:** `KMFSNIP` **type for *key macro abbreviations* snippets added to the framework. (see [here](https://github.com/yabwon/SAS_PACKAGES/releases/tag/20231111 "KMF-abbreviations"))**. diff --git a/SPF/Documentation/SAS(r) packages - the way to share (a how to)- Paper 4725-2020 - extended.pdf b/SPF/Documentation/SAS(r) packages - the way to share (a how to)- Paper 4725-2020 - extended.pdf index c6e1457..2956d1c 100644 Binary files a/SPF/Documentation/SAS(r) packages - the way to share (a how to)- Paper 4725-2020 - extended.pdf and b/SPF/Documentation/SAS(r) packages - the way to share (a how to)- Paper 4725-2020 - extended.pdf differ diff --git a/SPF/Macros/extendpackagesfileref.sas b/SPF/Macros/extendpackagesfileref.sas index f3751cb..3694098 100644 --- a/SPF/Macros/extendpackagesfileref.sas +++ b/SPF/Macros/extendpackagesfileref.sas @@ -6,7 +6,7 @@ when empty the "packages" value is used */ )/secure /*** HELP END ***/ -des = 'Macro to list directories pointed by "packages" fileref, version 20240927. Run %extendPackagesFileref(HELP) for help info.' +des = 'Macro to list directories pointed by "packages" fileref, version 20241014. Run %extendPackagesFileref(HELP) for help info.' ; %if %QUPCASE(&packages.) = HELP %then @@ -22,7 +22,7 @@ des = 'Macro to list directories pointed by "packages" fileref, version 20240927 %put ### This is short help information for the `extendPackagesFileref` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list directories pointed by 'packages' fileref, version `20240927` #; + %put # Macro to list directories pointed by 'packages' fileref, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/generatepackage.sas b/SPF/Macros/generatepackage.sas index 5184713..d0b4757 100644 --- a/SPF/Macros/generatepackage.sas +++ b/SPF/Macros/generatepackage.sas @@ -3,7 +3,7 @@ Macro to generate SAS packages. - Version 20240927 + Version 20241014 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -43,7 +43,7 @@ file name be created */ )/ secure minoperator /*** HELP END ***/ -des = 'Macro to generate SAS packages, version 20240927. Run %generatePackage() for help info.' +des = 'Macro to generate SAS packages, version 20241014. Run %generatePackage() for help info.' ; %if (%superq(filesLocation) = ) OR (%qupcase(&filesLocation.) = HELP) %then %do; @@ -58,7 +58,7 @@ des = 'Macro to generate SAS packages, version 20240927. Run %generatePackage() %put ### This is short help information for the `generatePackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to generate SAS packages, version `20240927` #; + %put # Macro to generate SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -527,6 +527,18 @@ DESCRIPTION END: | | | +-abc.sas [a file with a KMF-abbreviation snippet ABC, _with_ proper tagging, snippets names are in low-case] | + +-013_ds2pck [one file one PROC DS2 package] + | | + | +-abc.sas [a data set with a package ABC stored in WORK.ABC data set] + | | + | +-library.xyz.sas [a data set with a package LIBRARY.XYZ stored in LIBRARY.XYZ data set] + | + +-014_ds2thr [one file one PROC DS2 thread] + | | + | +-abc.sas [a data set with a thread ABC stored in WORK.ABC data set] + | | + | +-library.xyz.sas [a data set with a thread LIBRARY.XYZ stored in LIBRARY.XYZ data set] + | +-_ | +-00n_clean [if you need to clean something up after exec file execution, @@ -609,6 +621,7 @@ data &filesWithCodes.; 'IMLMODULE' 'PROTO' 'EXEC' 'CLEAN' 'LAZYDATA' 'TEST' 'CASLUDF' 'ADDCNT' 'KMFSNIP' + 'DS2PCK' 'DS2THR' )) then do; @@ -687,6 +700,9 @@ run; %let notesSourceOptions = %sysfunc(getoption(notes)) %sysfunc(getoption(source)); options NOnotes NOsource; +options mprint; +options notes source; + proc sort data = &filesWithCodes.; by order type file; run; @@ -793,7 +809,7 @@ run; /* code inspired by Kurt Bremser's "Talking to Your Host" article */ /* https://communities.sas.com/t5/SAS-User-Groups-Library/WUSS-Presentation-Talking-to-Your-Host/ta-p/838344 */ /* WUSS 2022 */ - + data &filesWithCodes.addCnt; run; @@ -855,9 +871,12 @@ title6 "MD5 hashed fileref of package lowcase name: &_PackageFileref_."; title8 "Required SAS packages: %qsysfunc(compress(%superq(packageReqPackages),%str(%'%")))" ; /* " */ %end; -footnote1 "SAS Packages Framework, version 20240927"; +footnote1 "SAS Packages Framework, version 20241014"; -proc print data = &filesWithCodes.(drop=base folderRef fileRef rc folderid _abort_ fileId additionalContent); +proc print + data = &filesWithCodes.(drop=base folderRef fileRef rc folderid _abort_ fileId additionalContent) + width=full +; run; title; @@ -876,7 +895,7 @@ title; title2 "Package additional content:"; proc print data=&filesWithCodes.addCnt(drop=root dir level) - label + label width=full ; run; %end; @@ -1111,6 +1130,8 @@ data _null_; isProto = 0; isIMLmodule = 0; isCASLudf = 0; + isDS2pck = 0; + isDS2thr = 0; %if (%superq(packageRequired) ne ) or (%superq(packageReqPackages) ne ) @@ -1350,7 +1371,7 @@ data _null_; ('LIBNAME' 'MACRO' /*'MACROS'*/ 'DATA' 'FUNCTION' /*'FUNCTIONS'*/ 'FORMAT' /*'FORMATS'*/ 'IMLMODULE' 'PROTO' 'EXEC' 'CLEAN' - 'LAZYDATA' 'TEST' 'ADDCNT' 'KMFSNIP')) + 'LAZYDATA' 'TEST' 'ADDCNT' 'KMFSNIP' 'DS2PCK' 'DS2THR')) then do; putlog 'WARNING: Type ' type 'is not yet supported.'; @@ -1361,8 +1382,11 @@ data _null_; isFormat + (upcase(type)=:'FORMAT'); isProto + (upcase(type)=:'PROTO'); isIMLmodule + (upcase(type)=:'IMLMODULE'); + isDS2pck + (upcase(type)=:'DS2PCK'); + isDS2thr + (upcase(type)=:'DS2THR'); - /* HEADERS for IML, FCMP, and PROTO - start */ + + /* HEADERS for PROC IML, FCMP, and PROTO - start */ if 1 = isFunction and upcase(type)=:'FUNCTION' then do; /* macro variable for test if cherry picking used FCMP */ @@ -1420,7 +1444,7 @@ data _null_; /* header, for IML modules */ put "proc iml ; "; end; - /* HEADERS for IML, FCMP, and PROTO - end */ + /* HEADERS for PROC IML, FCMP, and PROTO - end */ put ' ' / '%if (%str(*)=%superq(cherryPick)) or (' fileshort +(-1) ' in %superq(cherryPick)) %then %do; '; /* Cherry Pick test1 start */ @@ -1431,6 +1455,8 @@ data _null_; put ' %put %sysfunc(ifc(%SYSMACEXIST(' fileshort +(-1) ')=1, NOTE# Macro ' fileshort "exist. It will be overwritten by the macro from the &packageName. package, ));"; + + /* separate approach for EXEC */ if upcase(type)=:'EXEC' then do; /* User can suppress running the exec files */ @@ -1453,9 +1479,84 @@ data _null_; / ' )));' ; end; - else + /* separate approach for DS2 */ + else if (upcase(type) in: ('DS2PCK' 'DS2THR')) then do; - /* include the file with the code of the element */ + if 1 = isDS2pck and upcase(type)=:'DS2PCK' then + do; + /* macro variable for test if cherry picking used DS2 package */ + put 'data _null_; '; + put " call symputX('cherryPick_DS2PCK', 0, 'L'); "; + put 'run; '; + end; + if 1 = isDS2thr and upcase(type)=:'DS2THR' then + do; + /* macro variable for test if cherry picking used DS2 threads */ + put 'data _null_; '; + put " call symputX('cherryPick_DS2THR', 0, 'L'); "; + put 'run; '; + end; + + + /* since DS2 packages and threads are stored in SAS data sets */ + /* we have to check (before loading) if there is no "regular" */ + /* data set (or view) with the same name to avoid overwriting */ + if upcase(type) in: ('DS2PCK' 'DS2THR') then + do; + length DS2lib $ 8 DS2ds $ 32; + DS2lib = coalescec(scan(fileshort,-2,"."), "WORK"); + DS2ds = scan(fileshort,-1,"."); + + put '%put %sysfunc(ifc(%sysfunc(exist(' fileshort +(-1) '))=1,' + / '%sysfunc(dosubl(%str(options ps=min; title; options msglevel=n nodate notes source nomprint;' + / ' data _null_;' + / ' id = OPEN("' fileshort +(-1) '");' + / ' if id then do;' + / ' x = VARNUM(id, "SAS_CHECKSUM_") AND VARNUM(id, "SAS_ROWID_") AND (VARNUM(id, "SAS_TEXTTHREAD_") OR VARNUM(id, "SAS_TEXTPACKAGE_"));' + / ' y = ("DATA"=ATTRC(id, "MTYPE"));' + / ' if symexist("DS2force") then z = symgetn("DS2force"); else z = 0;' + / ' if (x AND y) OR z then do;' + / ' call execute("proc delete data=' fileshort +(-1) '; run;");' + / " put 'NOTE# The " fileshort "will be overwritten by the PROC DS2 package/thread from the &packageName. package.';" + + /* header for each DS2 packages or threads in PROC DS2 run */ + / ' call execute("proc ds2;");' + + / ' call execute(''%include' " &_PackageFileref_.(_" folder +(-1) "." file +(-1) ') / nosource2;'');' + + /* footer for each DS2 packages or threads in PROC DS2 run */ + / ' call execute("run; quit;");' + / ' call execute("options nonotes; proc datasets lib=' DS2lib 'noprint;");' + / " call execute('modify " DS2ds "(label=""Package: &packageName. ; Type: " type "; Name: " fileshort """);');" + / ' call execute("run; quit;");' + / ' end;' + / ' else put "WARNING: Data set ' fileshort 'exist and is not a PROC DS2 package/thread!"' + / ' / "WARNING- PROC DS2 package/thread ' fileshort 'will not be generated..."; ' + / ' id = CLOSE(id);' + / ' end;' + / ' run;))),' + / '%sysfunc(dosubl(%str(options ps=min; title; options msglevel=n nodate notes source nomprint;' + /* header for each DS2 packages or threads in PROC DS2 run */ + / ' proc ds2;' + + / ' %include' " &_PackageFileref_.(_" folder +(-1) "." file +(-1) ') / nosource2;' + + /* footer for each DS2 packages or threads in PROC DS2 run */ + / ' run; quit;' + / ' options nonotes; proc datasets lib=' DS2lib 'noprint;' + / " modify " DS2ds "(label=""Package: &packageName. ; Type: " type "; Name: " fileshort """);" + / ' run; quit;' + / '))),' + / '));' + / " " + / ; + + end; + + end; + else + do; + /* include the file with the code of the element, all other cases */ put ' %include' " &_PackageFileref_.(_" folder +(-1) "." file +(-1) ') / nosource2;'; end; @@ -1471,13 +1572,19 @@ data _null_; if upcase(type)=:'FORMAT' then put ' %let cherryPick_FORMAT = %eval(&cherryPick_FORMAT. + 1);'; + if upcase(type)=:'DS2PCK' then + put ' %let cherryPick_DS2PCK = %eval(&cherryPick_DS2PCK. + 1);'; + + if upcase(type)=:'DS2THR' then + put ' %let cherryPick_DS2THR = %eval(&cherryPick_DS2THR. + 1);'; + put '%end; ' /; /* Cherry Pick test1 end */ - /* FOOTERS for IML, FCMP, and PROTO - start */ + /* FOOTERS for PROC IML, FCMP, and PROTO - start */ if 1 = LAST.type and upcase(type) in ('FUNCTIONS' 'PROTO' 'FORMATS') then do; /* footer, for multiple functions in one FCMP run, one PROTO run, or one FORMAT run */ - put "run; " / ; + put "quit; " / ; end; if 1 = LAST.type and upcase(type)='IMLMODULE' then /* footer, for IML modules */ do; @@ -1488,7 +1595,7 @@ data _null_; '%end; ' / "quit; " / ; end; - /* FOOTERS for IML, FCMP, and PROTO - end */ + /* FOOTERS for PROC IML, FCMP, and PROTO - end */ /* add the link to the functions dataset, only for the first occurrence */ /*if 1 = isFunction and (upcase(type)=:'FUNCTION') then @@ -1576,7 +1683,7 @@ data _null_; %end; put +(-1) '`.;''' / ' !! '' %put The macro generated: '' !! put(dtCASLudf, E8601DT19.-L) !! ";"' / - ' !! '' %put with the SAS Packages Framework version 20240927.;''' / + ' !! '' %put with the SAS Packages Framework version 20241014.;''' / ' !! '' %put ****************************************************************************;''' / ' !! '' %GOTO theEndOfTheMacro;''' / ' !! '' %end;''' ; @@ -1741,7 +1848,7 @@ data _null_; %end; put +(-1) '`.; '' !!' / ''' %put The macro generated: ''' " !! put(dtIML, E8601DT19.-L) !! " '''; '' !!' / - ''' %put with the SAS Packages Framework version 20240927.; '' !! ' / + ''' %put with the SAS Packages Framework version 20241014.; '' !! ' / ''' %put ****************************************************************************; '' !! ' / ''' %GOTO theEndOfTheMacro; '' !! ' / ''' %end; '' !! ' / @@ -2256,15 +2363,33 @@ data _null_; /* put 'remove module = ' fileshort ';'; */ end; - /* delete datasets */ - put "proc sql noprint;"; + /* delete data sets */ + put "proc fedsql noprint;"; EOF = 0; do until(EOF); set &filesWithCodes. end = EOF; - if not (upcase(type)=:'DATA') then continue; + if not (upcase(type) in: ('DATA')) then continue; put '%put NOTE- Element of type ' type 'generated from the file "' file +(-1) '" will be deleted;'; put '%put NOTE- ;'; - put 'drop table ' fileshort ';' /; + put 'drop table ' fileshort ' FORCE;' /; + end; + put "quit;" /; + + /* delete PROC DS2 packages or threads */ + put 'data _null_; call symputx("_DS2_2_del_",0,"L"); run;'; + put "proc fedsql noprint;"; + EOF = 0; + do until(EOF); + set &filesWithCodes. end = EOF; + if not (upcase(type) in: ('DS2PCK' 'DS2THR')) then continue; + put '%put NOTE- Element of type ' type 'generated from the file "' file +(-1) '" will be deleted;' + / '%put NOTE- ;' + / '%let _DS2_2_del_ = %sysfunc(open(' fileshort '));' + / '%sysfunc(ifc(&_DS2_2_del_. AND %sysfunc(ATTRC(&_DS2_2_del_.,LABEL))=' + / '%str(' "Package: &packageName. ; Type: " type "; Name: " fileshort +(-1) '),drop table ' fileshort ' FORCE,)) ;' + / '%let _DS2_2_del_ = %sysfunc(close(&_DS2_2_del_.));' + ; + put ';' /; end; put "quit;" /; @@ -2392,12 +2517,13 @@ data _null_; length fileshort2 $ 256; select; - when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'", fileshort, "'" ); - when (upcase(type) =: "MACRO" ) fileshort2 = cats('''%', fileshort, "()'"); + when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'", fileshort, "'" ); + when (upcase(type) =: "MACRO" ) fileshort2 = cats('''%', fileshort, "()'" ); when (upcase(type) =: "FUNCTION" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "IMLMODULE" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "PROTO" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "FORMAT" ) fileshort2 = cats("'$", fileshort, ".'" ); + when (upcase(type) in ('DS2PCK' 'DS2THR')) fileshort2 = cats("'DS2", fileshort, "'" ); otherwise fileshort2 = fileshort; end; strX = catx('/', folder, order, type, file, fileshort, fileshort2); @@ -2529,7 +2655,7 @@ data _null_; %end; put 'put " " / @3 "--------------------------------------------------------------------" / " ";' - / 'put @3 "*SAS package generated by SAS Package Framework, version `20240927`*";' + / 'put @3 "*SAS package generated by SAS Package Framework, version `20241014`*";' / 'put " " / @3 "--------------------------------------------------------------------";'; put 'run; ' /; @@ -2568,13 +2694,14 @@ data _null_; length fileshort2 $ 256; select; - when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'", fileshort, "'" ); - when (upcase(type) =: "MACRO" ) fileshort2 = cats('''%', fileshort, "()'"); + when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'", fileshort, "'" ); + when (upcase(type) =: "MACRO" ) fileshort2 = cats('''%', fileshort, "()'" ); when (upcase(type) =: "FUNCTION" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "IMLMODULE" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "PROTO" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "FORMAT" ) fileshort2 = cats("'$", fileshort, ".'" ); when (upcase(type) =: "CASLUDF" ) fileshort2 = cats("'", fileshort, "()'" ); + when (upcase(type) in ('DS2PCK' 'DS2THR')) fileshort2 = cats("'DS2", fileshort, "'" ); otherwise fileshort2 = fileshort; end; strX = catx('/', folder, order, type, file, fileshort, fileshort2); @@ -3566,7 +3693,7 @@ data &filesWithCodes.markdown; %end; put " " / "--------------------------------------------------------------------" / " " - / "*SAS package generated by SAS Package Framework, version `20240927`*" + / "*SAS package generated by SAS Package Framework, version `20241014`*" / " " / "--------------------------------------------------------------------" / " "; put "# The `&packageName.` package content"; diff --git a/SPF/Macros/helppackage.sas b/SPF/Macros/helppackage.sas index 9532b62..83b2887 100644 --- a/SPF/Macros/helppackage.sas +++ b/SPF/Macros/helppackage.sas @@ -28,7 +28,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to get help about SAS package, version 20240927. Run %helpPackage() for help info.' +des = 'Macro to get help about SAS package, version 20241014. Run %helpPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -43,7 +43,7 @@ des = 'Macro to get help about SAS package, version 20240927. Run %helpPackage() %put ### This is short help information for the `helpPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get help about SAS packages, version `20240927` #; + %put # Macro to get help about SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/installpackage.sas b/SPF/Macros/installpackage.sas index a01b4ca..da7e646 100644 --- a/SPF/Macros/installpackage.sas +++ b/SPF/Macros/installpackage.sas @@ -1,5 +1,5 @@ /*+installPackage+*/ -/* Macros to install SAS packages, version 20240927 */ +/* Macros to install SAS packages, version 20241014 */ /* A SAS package is a zip file containing a group of files with SAS code (macros, functions, data steps generating data, etc.) wrapped up together and %INCLUDEed by @@ -23,7 +23,7 @@ /secure minoperator /*** HELP END ***/ -des = 'Macro to install SAS package, version 20240927. Run %%installPackage() for help info.' +des = 'Macro to install SAS package, version 20241014. Run %%installPackage() for help info.' ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then %do; @@ -38,7 +38,7 @@ des = 'Macro to install SAS package, version 20240927. Run %%installPackage() fo %put ### This is short help information for the `installPackage` macro #; %put #--------------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to install SAS packages, version `20240927` #; + %put # Macro to install SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/listpackages.sas b/SPF/Macros/listpackages.sas index 6304320..4c3ce43 100644 --- a/SPF/Macros/listpackages.sas +++ b/SPF/Macros/listpackages.sas @@ -3,7 +3,7 @@ Macro to list SAS packages in packages folder. - Version 20240927 + Version 20241014 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -23,7 +23,7 @@ %macro listPackages() /secure PARMBUFF -des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20240927.' +des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20241014.' ; %if %QUPCASE(&SYSPBUFF.) = %str(%(HELP%)) %then %do; @@ -38,7 +38,7 @@ des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HE %put ### This is short help information for the `listPackages` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list available SAS packages, version `20240927` #; + %put # Macro to list available SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/loadpackage.sas b/SPF/Macros/loadpackage.sas index 67979d4..e4dc408 100644 --- a/SPF/Macros/loadpackage.sas +++ b/SPF/Macros/loadpackage.sas @@ -30,11 +30,13 @@ , loadAddCnt=0 /* should the additional content be loaded? default is 0 - means No, 1 means Yes */ , suppressExec=0 /* indicates if loading of exec files - should be suppressed, 1=suppress + should be suppressed, 1=suppress */ +, DS2force=0 /* indicates if PROC DS2 packages and threads + should be loaded if a data set exists, 0=do not load */ )/secure /*** HELP END ***/ -des = 'Macro to load SAS package, version 20240927. Run %loadPackage() for help info.' +des = 'Macro to load SAS package, version 20241014. Run %loadPackage() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -50,7 +52,7 @@ minoperator %put ### This is short help information for the `loadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* SAS packages, version `20240927` #; + %put # Macro to *load* SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -110,6 +112,10 @@ minoperator %put # should be suppressed, default value is `0`, #; %put # when set to `1` `exec` files are *not* loaded #; %put # #; + %put # - `DS2force=` *Optional.* Indicates if loading of `PROC DS2` packages #; + %put # or threads should overwrite existing SAS data sets. #; + %put # Default value of `0` means "do not overwrite". #; + %put # #; %put #-------------------------------------------------------------------------------#; %put # #; %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation` #; @@ -212,6 +218,11 @@ minoperator %let suppressExec = 0; %end; + %if %superq(DS2force) NE 1 %then + %do; + %let DS2force = 0; + %end; + filename &_PackageFileref_. &ZIP. /* put location of package myPackageFile.zip here */ "&path./%lowcase(&packageName.).&zip." %unquote(&options.) diff --git a/SPF/Macros/loadpackageaddcnt.sas b/SPF/Macros/loadpackageaddcnt.sas index ab14096..42d7b2b 100644 --- a/SPF/Macros/loadpackageaddcnt.sas +++ b/SPF/Macros/loadpackageaddcnt.sas @@ -19,7 +19,7 @@ is provided in required version */ )/secure /*** HELP END ***/ -des = 'Macro to load additional content for a SAS package, version 20240927. Run %loadPackageAddCnt() for help info.' +des = 'Macro to load additional content for a SAS package, version 20241014. Run %loadPackageAddCnt() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -35,7 +35,7 @@ minoperator %put ### This is short help information for the `loadPackageAddCnt` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* additional content for a SAS package, version `20240927` #; + %put # Macro to *load* additional content for a SAS package, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/loadpackages.sas b/SPF/Macros/loadpackages.sas index 254899b..7b9ec4c 100644 --- a/SPF/Macros/loadpackages.sas +++ b/SPF/Macros/loadpackages.sas @@ -11,7 +11,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to load multiple SAS packages at one run, version 20240927. Run %loadPackages() for help info.' +des = 'Macro to load multiple SAS packages at one run, version 20241014. Run %loadPackages() for help info.' parmbuff ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then @@ -27,7 +27,7 @@ parmbuff %put ### This is short help information for the `loadPackageS` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro wrapper for the loadPackage macro, version `20240927` #; + %put # Macro wrapper for the loadPackage macro, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/previewpackage.sas b/SPF/Macros/previewpackage.sas index 2b0c443..e8719f9 100644 --- a/SPF/Macros/previewpackage.sas +++ b/SPF/Macros/previewpackage.sas @@ -23,7 +23,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to preview content of a SAS package, version 20240927. Run %previewPackage() for help info.' +des = 'Macro to preview content of a SAS package, version 20241014. Run %previewPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -38,7 +38,7 @@ des = 'Macro to preview content of a SAS package, version 20240927. Run %preview %put ### This is short help information for the `previewPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get preview of a SAS packages, version `20240927` #; + %put # Macro to get preview of a SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/unloadpackage.sas b/SPF/Macros/unloadpackage.sas index 457ed53..c54062e 100644 --- a/SPF/Macros/unloadpackage.sas +++ b/SPF/Macros/unloadpackage.sas @@ -20,7 +20,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to unload SAS package, version 20240927. Run %unloadPackage() for help info.' +des = 'Macro to unload SAS package, version 20241014. Run %unloadPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -35,7 +35,7 @@ des = 'Macro to unload SAS package, version 20240927. Run %unloadPackage() for h %put ### This is short help information for the `unloadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to unload SAS packages, version `20240927` #; + %put # Macro to unload SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/verifypackage.sas b/SPF/Macros/verifypackage.sas index 91b69cc..b5528d6 100644 --- a/SPF/Macros/verifypackage.sas +++ b/SPF/Macros/verifypackage.sas @@ -13,7 +13,7 @@ hashing_file() function, SAS 9.4M6 */ )/secure /*** HELP END ***/ -des = 'Macro to verify SAS package with the hash digest, version 20240927. Run %verifyPackage() for help info.' +des = 'Macro to verify SAS package with the hash digest, version 20241014. Run %verifyPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -28,7 +28,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20240927. Run % %put ### This is short help information for the `verifyPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to verify SAS package with it hash digest, version `20240927` #; + %put # Macro to verify SAS package with it hash digest, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/SPFinit.md b/SPF/SPFinit.md index e1b1a9d..ce5875d 100644 --- a/SPF/SPFinit.md +++ b/SPF/SPFinit.md @@ -22,7 +22,7 @@ A **SAS package** is an automatically generated, single, stand alone *zip* file The *purpose of a package* is to be a simple, and easy to access, code sharing medium, which will allow: on the one hand, to separate the code complex dependencies created by the developer from the user experience with the final product and, on the other hand, reduce developer's and user's unnecessary frustration related to a remote deployment process. -In this repository we are presenting the **SAS Packages Framework** which allows to develop and use SAS packages. The latest version of SPF is **`20240927`**. +In this repository we are presenting the **SAS Packages Framework** which allows to develop and use SAS packages. The latest version of SPF is **`20241014`**. **To get started with SAS Packages** try this [**`Getting Started with SAS Packages`**](https://github.com/yabwon/SAS_PACKAGES/blob/main/SPF/Documentation/Getting_Started_with_SAS_Packages.pdf "Getting Started with SAS Packages") presentation (see the `./SPF/Documentation` directory). @@ -40,7 +40,7 @@ After assigning the directory do not change them when using the SPF since it may ## This is short help information for the `installPackage` macro -------------------------------------------------------------------------------------------- - Macro to install SAS packages, version `20240927` + Macro to install SAS packages, version `20241014` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -154,7 +154,7 @@ filename packages "C:/SAS_PACKAGES"; ## This is short help information for the `helpPackage` macro ------------------------------------------------------------------------------- - Macro to get help about SAS packages, version `20240927` + Macro to get help about SAS packages, version `20241014` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -230,7 +230,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `loadPackage` macro ------------------------------------------------------------------------------- - Macro to *load* SAS packages, version `20240927` + Macro to *load* SAS packages, version `20241014` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -290,6 +290,10 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; should be suppressed, default value is `0`, when set to `1` `exec` files are *not* loaded + - `DS2force=` *Optional.* Indicates if loading of `PROC DS2` packages + or threads should overwrite existing SAS data sets. + Default value of `0` means "do not overwrite". + ------------------------------------------------------------------------------- Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation` @@ -382,7 +386,7 @@ If created, those macros are automatically deleted when the `%unloadPackage()` m ## This is short help information for the `loadPackageS` macro ------------------------------------------------------------------------------- - Macro wrapper for the loadPackage macro, version `20240927` + Macro wrapper for the loadPackage macro, version `20241014` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -431,7 +435,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `unloadPackage` macro ------------------------------------------------------------------------------- - Macro to unload SAS packages, version `20240927` + Macro to unload SAS packages, version `20241014` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -496,7 +500,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `listPackages` macro ----------------------------------------------------------------------------------------- - Macro to list available SAS packages, version `20240927` + Macro to list available SAS packages, version `20241014` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -537,7 +541,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `verifyPackage` macro ------------------------------------------------------------------------------- - Macro to verify SAS package with it hash digest, version `20240927` + Macro to verify SAS package with it hash digest, version `20241014` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -591,7 +595,7 @@ filename packages "C:/SAS_PACKAGES"; %* set-up a directory for packages; ## This is short help information for the `previewPackage` macro ------------------------------------------------------------------------------- - Macro to get preview of a SAS packages, version `20240927` + Macro to get preview of a SAS packages, version `20241014` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -658,7 +662,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `generatePackage` macro ------------------------------------------------------------------------------- - Macro to generate SAS packages, version `20240927` + Macro to generate SAS packages, version `20241014` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -873,7 +877,7 @@ All files have to have `.sas` extension. Other files are ignored. ## This is short help information for the `extendPackagesFileref` macro ----------------------------------------------------------------------------------------- - Macro to list directories pointed by 'packages' fileref, version `20240927` + Macro to list directories pointed by 'packages' fileref, version `20241014` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -913,7 +917,7 @@ filename packages ("D:/NEW_DIR" %extendPackagesFileref()); %* add new directory; ## This is short help information for the `loadPackageAddCnt` macro ------------------------------------------------------------------------------- - Macro to load *additional content* for a SAS package, version `20240927` + Macro to load *additional content* for a SAS package, version `20241014` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating diff --git a/SPF/SPFinit.sas b/SPF/SPFinit.sas index cc67e0e..65610a3 100644 --- a/SPF/SPFinit.sas +++ b/SPF/SPFinit.sas @@ -42,7 +42,7 @@ - to unload, or - to generate SAS packages. - Version 20240927. + Version 20241014. See examples below. A SAS package is a zip file containing a group of files @@ -85,11 +85,13 @@ , loadAddCnt=0 /* should the additional content be loaded? default is 0 - means No, 1 means Yes */ , suppressExec=0 /* indicates if loading of exec files - should be suppressed, 1=suppress + should be suppressed, 1=suppress */ +, DS2force=0 /* indicates if PROC DS2 packages and threads + should be loaded if a data set exists, 0=do not load */ )/secure /*** HELP END ***/ -des = 'Macro to load SAS package, version 20240927. Run %loadPackage() for help info.' +des = 'Macro to load SAS package, version 20241014. Run %loadPackage() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -105,7 +107,7 @@ minoperator %put ### This is short help information for the `loadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* SAS packages, version `20240927` #; + %put # Macro to *load* SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -165,6 +167,10 @@ minoperator %put # should be suppressed, default value is `0`, #; %put # when set to `1` `exec` files are *not* loaded #; %put # #; + %put # - `DS2force=` *Optional.* Indicates if loading of `PROC DS2` packages #; + %put # or threads should overwrite existing SAS data sets. #; + %put # Default value of `0` means "do not overwrite". #; + %put # #; %put #-------------------------------------------------------------------------------#; %put # #; %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation` #; @@ -267,6 +273,11 @@ minoperator %let suppressExec = 0; %end; + %if %superq(DS2force) NE 1 %then + %do; + %let DS2force = 0; + %end; + filename &_PackageFileref_. &ZIP. /* put location of package myPackageFile.zip here */ "&path./%lowcase(&packageName.).&zip." %unquote(&options.) @@ -361,7 +372,7 @@ minoperator */ )/secure /*** HELP END ***/ -des = 'Macro to unload SAS package, version 20240927. Run %unloadPackage() for help info.' +des = 'Macro to unload SAS package, version 20241014. Run %unloadPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -376,7 +387,7 @@ des = 'Macro to unload SAS package, version 20240927. Run %unloadPackage() for h %put ### This is short help information for the `unloadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to unload SAS packages, version `20240927` #; + %put # Macro to unload SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -527,7 +538,7 @@ des = 'Macro to unload SAS package, version 20240927. Run %unloadPackage() for h */ )/secure /*** HELP END ***/ -des = 'Macro to get help about SAS package, version 20240927. Run %helpPackage() for help info.' +des = 'Macro to get help about SAS package, version 20241014. Run %helpPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -542,7 +553,7 @@ des = 'Macro to get help about SAS package, version 20240927. Run %helpPackage() %put ### This is short help information for the `helpPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get help about SAS packages, version `20240927` #; + %put # Macro to get help about SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -683,7 +694,7 @@ TODO: */ /*+installPackage+*/ -/* Macros to install SAS packages, version 20240927 */ +/* Macros to install SAS packages, version 20241014 */ /* A SAS package is a zip file containing a group of files with SAS code (macros, functions, data steps generating data, etc.) wrapped up together and %INCLUDEed by @@ -707,7 +718,7 @@ TODO: /secure minoperator /*** HELP END ***/ -des = 'Macro to install SAS package, version 20240927. Run %%installPackage() for help info.' +des = 'Macro to install SAS package, version 20241014. Run %%installPackage() for help info.' ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then %do; @@ -722,7 +733,7 @@ des = 'Macro to install SAS package, version 20240927. Run %%installPackage() fo %put ### This is short help information for the `installPackage` macro #; %put #--------------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to install SAS packages, version `20240927` #; + %put # Macro to install SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -1255,7 +1266,7 @@ des = 'Macro to install SAS package, version 20240927. Run %%installPackage() fo Macro to list SAS packages in packages folder. - Version 20240927 + Version 20241014 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1275,7 +1286,7 @@ des = 'Macro to install SAS package, version 20240927. Run %%installPackage() fo %macro listPackages() /secure PARMBUFF -des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20240927.' +des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20241014.' ; %if %QUPCASE(&SYSPBUFF.) = %str(%(HELP%)) %then %do; @@ -1290,7 +1301,7 @@ des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HE %put ### This is short help information for the `listPackages` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list available SAS packages, version `20240927` #; + %put # Macro to list available SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -1441,7 +1452,7 @@ options ls = &ls_tmp. ps = &ps_tmp. ¬es_tmp. &source_tmp.; Macro to generate SAS packages. - Version 20240927 + Version 20241014 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1481,7 +1492,7 @@ options ls = &ls_tmp. ps = &ps_tmp. ¬es_tmp. &source_tmp.; file name be created */ )/ secure minoperator /*** HELP END ***/ -des = 'Macro to generate SAS packages, version 20240927. Run %generatePackage() for help info.' +des = 'Macro to generate SAS packages, version 20241014. Run %generatePackage() for help info.' ; %if (%superq(filesLocation) = ) OR (%qupcase(&filesLocation.) = HELP) %then %do; @@ -1496,7 +1507,7 @@ des = 'Macro to generate SAS packages, version 20240927. Run %generatePackage() %put ### This is short help information for the `generatePackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to generate SAS packages, version `20240927` #; + %put # Macro to generate SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -1965,6 +1976,18 @@ DESCRIPTION END: | | | +-abc.sas [a file with a KMF-abbreviation snippet ABC, _with_ proper tagging, snippets names are in low-case] | + +-013_ds2pck [one file one PROC DS2 package] + | | + | +-abc.sas [a data set with a package ABC stored in WORK.ABC data set] + | | + | +-library.xyz.sas [a data set with a package LIBRARY.XYZ stored in LIBRARY.XYZ data set] + | + +-014_ds2thr [one file one PROC DS2 thread] + | | + | +-abc.sas [a data set with a thread ABC stored in WORK.ABC data set] + | | + | +-library.xyz.sas [a data set with a thread LIBRARY.XYZ stored in LIBRARY.XYZ data set] + | +-_ | +-00n_clean [if you need to clean something up after exec file execution, @@ -2047,6 +2070,7 @@ data &filesWithCodes.; 'IMLMODULE' 'PROTO' 'EXEC' 'CLEAN' 'LAZYDATA' 'TEST' 'CASLUDF' 'ADDCNT' 'KMFSNIP' + 'DS2PCK' 'DS2THR' )) then do; @@ -2125,6 +2149,9 @@ run; %let notesSourceOptions = %sysfunc(getoption(notes)) %sysfunc(getoption(source)); options NOnotes NOsource; +options mprint; +options notes source; + proc sort data = &filesWithCodes.; by order type file; run; @@ -2231,7 +2258,7 @@ run; /* code inspired by Kurt Bremser's "Talking to Your Host" article */ /* https://communities.sas.com/t5/SAS-User-Groups-Library/WUSS-Presentation-Talking-to-Your-Host/ta-p/838344 */ /* WUSS 2022 */ - + data &filesWithCodes.addCnt; run; @@ -2293,9 +2320,12 @@ title6 "MD5 hashed fileref of package lowcase name: &_PackageFileref_."; title8 "Required SAS packages: %qsysfunc(compress(%superq(packageReqPackages),%str(%'%")))" ; /* " */ %end; -footnote1 "SAS Packages Framework, version 20240927"; +footnote1 "SAS Packages Framework, version 20241014"; -proc print data = &filesWithCodes.(drop=base folderRef fileRef rc folderid _abort_ fileId additionalContent); +proc print + data = &filesWithCodes.(drop=base folderRef fileRef rc folderid _abort_ fileId additionalContent) + width=full +; run; title; @@ -2314,7 +2344,7 @@ title; title2 "Package additional content:"; proc print data=&filesWithCodes.addCnt(drop=root dir level) - label + label width=full ; run; %end; @@ -2549,6 +2579,8 @@ data _null_; isProto = 0; isIMLmodule = 0; isCASLudf = 0; + isDS2pck = 0; + isDS2thr = 0; %if (%superq(packageRequired) ne ) or (%superq(packageReqPackages) ne ) @@ -2788,7 +2820,7 @@ data _null_; ('LIBNAME' 'MACRO' /*'MACROS'*/ 'DATA' 'FUNCTION' /*'FUNCTIONS'*/ 'FORMAT' /*'FORMATS'*/ 'IMLMODULE' 'PROTO' 'EXEC' 'CLEAN' - 'LAZYDATA' 'TEST' 'ADDCNT' 'KMFSNIP')) + 'LAZYDATA' 'TEST' 'ADDCNT' 'KMFSNIP' 'DS2PCK' 'DS2THR')) then do; putlog 'WARNING: Type ' type 'is not yet supported.'; @@ -2799,8 +2831,11 @@ data _null_; isFormat + (upcase(type)=:'FORMAT'); isProto + (upcase(type)=:'PROTO'); isIMLmodule + (upcase(type)=:'IMLMODULE'); + isDS2pck + (upcase(type)=:'DS2PCK'); + isDS2thr + (upcase(type)=:'DS2THR'); - /* HEADERS for IML, FCMP, and PROTO - start */ + + /* HEADERS for PROC IML, FCMP, and PROTO - start */ if 1 = isFunction and upcase(type)=:'FUNCTION' then do; /* macro variable for test if cherry picking used FCMP */ @@ -2858,7 +2893,7 @@ data _null_; /* header, for IML modules */ put "proc iml ; "; end; - /* HEADERS for IML, FCMP, and PROTO - end */ + /* HEADERS for PROC IML, FCMP, and PROTO - end */ put ' ' / '%if (%str(*)=%superq(cherryPick)) or (' fileshort +(-1) ' in %superq(cherryPick)) %then %do; '; /* Cherry Pick test1 start */ @@ -2869,6 +2904,8 @@ data _null_; put ' %put %sysfunc(ifc(%SYSMACEXIST(' fileshort +(-1) ')=1, NOTE# Macro ' fileshort "exist. It will be overwritten by the macro from the &packageName. package, ));"; + + /* separate approach for EXEC */ if upcase(type)=:'EXEC' then do; /* User can suppress running the exec files */ @@ -2891,9 +2928,84 @@ data _null_; / ' )));' ; end; - else + /* separate approach for DS2 */ + else if (upcase(type) in: ('DS2PCK' 'DS2THR')) then do; - /* include the file with the code of the element */ + if 1 = isDS2pck and upcase(type)=:'DS2PCK' then + do; + /* macro variable for test if cherry picking used DS2 package */ + put 'data _null_; '; + put " call symputX('cherryPick_DS2PCK', 0, 'L'); "; + put 'run; '; + end; + if 1 = isDS2thr and upcase(type)=:'DS2THR' then + do; + /* macro variable for test if cherry picking used DS2 threads */ + put 'data _null_; '; + put " call symputX('cherryPick_DS2THR', 0, 'L'); "; + put 'run; '; + end; + + + /* since DS2 packages and threads are stored in SAS data sets */ + /* we have to check (before loading) if there is no "regular" */ + /* data set (or view) with the same name to avoid overwriting */ + if upcase(type) in: ('DS2PCK' 'DS2THR') then + do; + length DS2lib $ 8 DS2ds $ 32; + DS2lib = coalescec(scan(fileshort,-2,"."), "WORK"); + DS2ds = scan(fileshort,-1,"."); + + put '%put %sysfunc(ifc(%sysfunc(exist(' fileshort +(-1) '))=1,' + / '%sysfunc(dosubl(%str(options ps=min; title; options msglevel=n nodate notes source nomprint;' + / ' data _null_;' + / ' id = OPEN("' fileshort +(-1) '");' + / ' if id then do;' + / ' x = VARNUM(id, "SAS_CHECKSUM_") AND VARNUM(id, "SAS_ROWID_") AND (VARNUM(id, "SAS_TEXTTHREAD_") OR VARNUM(id, "SAS_TEXTPACKAGE_"));' + / ' y = ("DATA"=ATTRC(id, "MTYPE"));' + / ' if symexist("DS2force") then z = symgetn("DS2force"); else z = 0;' + / ' if (x AND y) OR z then do;' + / ' call execute("proc delete data=' fileshort +(-1) '; run;");' + / " put 'NOTE# The " fileshort "will be overwritten by the PROC DS2 package/thread from the &packageName. package.';" + + /* header for each DS2 packages or threads in PROC DS2 run */ + / ' call execute("proc ds2;");' + + / ' call execute(''%include' " &_PackageFileref_.(_" folder +(-1) "." file +(-1) ') / nosource2;'');' + + /* footer for each DS2 packages or threads in PROC DS2 run */ + / ' call execute("run; quit;");' + / ' call execute("options nonotes; proc datasets lib=' DS2lib 'noprint;");' + / " call execute('modify " DS2ds "(label=""Package: &packageName. ; Type: " type "; Name: " fileshort """);');" + / ' call execute("run; quit;");' + / ' end;' + / ' else put "WARNING: Data set ' fileshort 'exist and is not a PROC DS2 package/thread!"' + / ' / "WARNING- PROC DS2 package/thread ' fileshort 'will not be generated..."; ' + / ' id = CLOSE(id);' + / ' end;' + / ' run;))),' + / '%sysfunc(dosubl(%str(options ps=min; title; options msglevel=n nodate notes source nomprint;' + /* header for each DS2 packages or threads in PROC DS2 run */ + / ' proc ds2;' + + / ' %include' " &_PackageFileref_.(_" folder +(-1) "." file +(-1) ') / nosource2;' + + /* footer for each DS2 packages or threads in PROC DS2 run */ + / ' run; quit;' + / ' options nonotes; proc datasets lib=' DS2lib 'noprint;' + / " modify " DS2ds "(label=""Package: &packageName. ; Type: " type "; Name: " fileshort """);" + / ' run; quit;' + / '))),' + / '));' + / " " + / ; + + end; + + end; + else + do; + /* include the file with the code of the element, all other cases */ put ' %include' " &_PackageFileref_.(_" folder +(-1) "." file +(-1) ') / nosource2;'; end; @@ -2909,13 +3021,19 @@ data _null_; if upcase(type)=:'FORMAT' then put ' %let cherryPick_FORMAT = %eval(&cherryPick_FORMAT. + 1);'; + if upcase(type)=:'DS2PCK' then + put ' %let cherryPick_DS2PCK = %eval(&cherryPick_DS2PCK. + 1);'; + + if upcase(type)=:'DS2THR' then + put ' %let cherryPick_DS2THR = %eval(&cherryPick_DS2THR. + 1);'; + put '%end; ' /; /* Cherry Pick test1 end */ - /* FOOTERS for IML, FCMP, and PROTO - start */ + /* FOOTERS for PROC IML, FCMP, and PROTO - start */ if 1 = LAST.type and upcase(type) in ('FUNCTIONS' 'PROTO' 'FORMATS') then do; /* footer, for multiple functions in one FCMP run, one PROTO run, or one FORMAT run */ - put "run; " / ; + put "quit; " / ; end; if 1 = LAST.type and upcase(type)='IMLMODULE' then /* footer, for IML modules */ do; @@ -2926,7 +3044,7 @@ data _null_; '%end; ' / "quit; " / ; end; - /* FOOTERS for IML, FCMP, and PROTO - end */ + /* FOOTERS for PROC IML, FCMP, and PROTO - end */ /* add the link to the functions dataset, only for the first occurrence */ /*if 1 = isFunction and (upcase(type)=:'FUNCTION') then @@ -3014,7 +3132,7 @@ data _null_; %end; put +(-1) '`.;''' / ' !! '' %put The macro generated: '' !! put(dtCASLudf, E8601DT19.-L) !! ";"' / - ' !! '' %put with the SAS Packages Framework version 20240927.;''' / + ' !! '' %put with the SAS Packages Framework version 20241014.;''' / ' !! '' %put ****************************************************************************;''' / ' !! '' %GOTO theEndOfTheMacro;''' / ' !! '' %end;''' ; @@ -3179,7 +3297,7 @@ data _null_; %end; put +(-1) '`.; '' !!' / ''' %put The macro generated: ''' " !! put(dtIML, E8601DT19.-L) !! " '''; '' !!' / - ''' %put with the SAS Packages Framework version 20240927.; '' !! ' / + ''' %put with the SAS Packages Framework version 20241014.; '' !! ' / ''' %put ****************************************************************************; '' !! ' / ''' %GOTO theEndOfTheMacro; '' !! ' / ''' %end; '' !! ' / @@ -3694,15 +3812,33 @@ data _null_; /* put 'remove module = ' fileshort ';'; */ end; - /* delete datasets */ - put "proc sql noprint;"; + /* delete data sets */ + put "proc fedsql noprint;"; EOF = 0; do until(EOF); set &filesWithCodes. end = EOF; - if not (upcase(type)=:'DATA') then continue; + if not (upcase(type) in: ('DATA')) then continue; put '%put NOTE- Element of type ' type 'generated from the file "' file +(-1) '" will be deleted;'; put '%put NOTE- ;'; - put 'drop table ' fileshort ';' /; + put 'drop table ' fileshort ' FORCE;' /; + end; + put "quit;" /; + + /* delete PROC DS2 packages or threads */ + put 'data _null_; call symputx("_DS2_2_del_",0,"L"); run;'; + put "proc fedsql noprint;"; + EOF = 0; + do until(EOF); + set &filesWithCodes. end = EOF; + if not (upcase(type) in: ('DS2PCK' 'DS2THR')) then continue; + put '%put NOTE- Element of type ' type 'generated from the file "' file +(-1) '" will be deleted;' + / '%put NOTE- ;' + / '%let _DS2_2_del_ = %sysfunc(open(' fileshort '));' + / '%sysfunc(ifc(&_DS2_2_del_. AND %sysfunc(ATTRC(&_DS2_2_del_.,LABEL))=' + / '%str(' "Package: &packageName. ; Type: " type "; Name: " fileshort +(-1) '),drop table ' fileshort ' FORCE,)) ;' + / '%let _DS2_2_del_ = %sysfunc(close(&_DS2_2_del_.));' + ; + put ';' /; end; put "quit;" /; @@ -3830,12 +3966,13 @@ data _null_; length fileshort2 $ 256; select; - when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'", fileshort, "'" ); - when (upcase(type) =: "MACRO" ) fileshort2 = cats('''%', fileshort, "()'"); + when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'", fileshort, "'" ); + when (upcase(type) =: "MACRO" ) fileshort2 = cats('''%', fileshort, "()'" ); when (upcase(type) =: "FUNCTION" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "IMLMODULE" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "PROTO" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "FORMAT" ) fileshort2 = cats("'$", fileshort, ".'" ); + when (upcase(type) in ('DS2PCK' 'DS2THR')) fileshort2 = cats("'DS2", fileshort, "'" ); otherwise fileshort2 = fileshort; end; strX = catx('/', folder, order, type, file, fileshort, fileshort2); @@ -3967,7 +4104,7 @@ data _null_; %end; put 'put " " / @3 "--------------------------------------------------------------------" / " ";' - / 'put @3 "*SAS package generated by SAS Package Framework, version `20240927`*";' + / 'put @3 "*SAS package generated by SAS Package Framework, version `20241014`*";' / 'put " " / @3 "--------------------------------------------------------------------";'; put 'run; ' /; @@ -4006,13 +4143,14 @@ data _null_; length fileshort2 $ 256; select; - when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'", fileshort, "'" ); - when (upcase(type) =: "MACRO" ) fileshort2 = cats('''%', fileshort, "()'"); + when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'", fileshort, "'" ); + when (upcase(type) =: "MACRO" ) fileshort2 = cats('''%', fileshort, "()'" ); when (upcase(type) =: "FUNCTION" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "IMLMODULE" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "PROTO" ) fileshort2 = cats("'", fileshort, "()'" ); when (upcase(type) =: "FORMAT" ) fileshort2 = cats("'$", fileshort, ".'" ); when (upcase(type) =: "CASLUDF" ) fileshort2 = cats("'", fileshort, "()'" ); + when (upcase(type) in ('DS2PCK' 'DS2THR')) fileshort2 = cats("'DS2", fileshort, "'" ); otherwise fileshort2 = fileshort; end; strX = catx('/', folder, order, type, file, fileshort, fileshort2); @@ -5004,7 +5142,7 @@ data &filesWithCodes.markdown; %end; put " " / "--------------------------------------------------------------------" / " " - / "*SAS package generated by SAS Package Framework, version `20240927`*" + / "*SAS package generated by SAS Package Framework, version `20241014`*" / " " / "--------------------------------------------------------------------" / " "; put "# The `&packageName.` package content"; @@ -5282,7 +5420,7 @@ TODO: (in Polish) */ )/secure /*** HELP END ***/ -des = 'Macro to load multiple SAS packages at one run, version 20240927. Run %loadPackages() for help info.' +des = 'Macro to load multiple SAS packages at one run, version 20241014. Run %loadPackages() for help info.' parmbuff ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then @@ -5298,7 +5436,7 @@ parmbuff %put ### This is short help information for the `loadPackageS` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro wrapper for the loadPackage macro, version `20240927` #; + %put # Macro wrapper for the loadPackage macro, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -5395,7 +5533,7 @@ parmbuff hashing_file() function, SAS 9.4M6 */ )/secure /*** HELP END ***/ -des = 'Macro to verify SAS package with the hash digest, version 20240927. Run %verifyPackage() for help info.' +des = 'Macro to verify SAS package with the hash digest, version 20241014. Run %verifyPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -5410,7 +5548,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20240927. Run % %put ### This is short help information for the `verifyPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to verify SAS package with it hash digest, version `20240927` #; + %put # Macro to verify SAS package with it hash digest, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -5590,7 +5728,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20240927. Run % */ )/secure /*** HELP END ***/ -des = 'Macro to preview content of a SAS package, version 20240927. Run %previewPackage() for help info.' +des = 'Macro to preview content of a SAS package, version 20241014. Run %previewPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -5605,7 +5743,7 @@ des = 'Macro to preview content of a SAS package, version 20240927. Run %preview %put ### This is short help information for the `previewPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get preview of a SAS packages, version `20240927` #; + %put # Macro to get preview of a SAS packages, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -5735,7 +5873,7 @@ des = 'Macro to preview content of a SAS package, version 20240927. Run %preview when empty the "packages" value is used */ )/secure /*** HELP END ***/ -des = 'Macro to list directories pointed by "packages" fileref, version 20240927. Run %extendPackagesFileref(HELP) for help info.' +des = 'Macro to list directories pointed by "packages" fileref, version 20241014. Run %extendPackagesFileref(HELP) for help info.' ; %if %QUPCASE(&packages.) = HELP %then @@ -5751,7 +5889,7 @@ des = 'Macro to list directories pointed by "packages" fileref, version 20240927 %put ### This is short help information for the `extendPackagesFileref` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list directories pointed by 'packages' fileref, version `20240927` #; + %put # Macro to list directories pointed by 'packages' fileref, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -5852,7 +5990,7 @@ filename packages list; is provided in required version */ )/secure /*** HELP END ***/ -des = 'Macro to load additional content for a SAS package, version 20240927. Run %loadPackageAddCnt() for help info.' +des = 'Macro to load additional content for a SAS package, version 20241014. Run %loadPackageAddCnt() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -5868,7 +6006,7 @@ minoperator %put ### This is short help information for the `loadPackageAddCnt` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* additional content for a SAS package, version `20240927` #; + %put # Macro to *load* additional content for a SAS package, version `20241014` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #;