d16a71f move preproc and rpkg macro defs into separate packages

Authored and Committed by clime 5 years ago
68 files changed. 1121 lines added. 257 lines removed.
macros/LICENSE
file added
+339
macros/examples/git.spec.rpkgexamples/simple-template.spec.rpkg
file renamed
+0 -0
macros/examples/git_cwd.spec.rpkgexamples/simple-template-cwd.spec.rpkg
file renamed
+0 -0
macros/examples/git_dir.spec.rpkgexamples/simple-template-dir.spec.rpkg
file renamed
+0 -0
macros/macros.d/all.bash
file added
+10
macros/macros.d/git.bashrpkglib/preproc/lib.sh
file renamed
+10 -9
macros/macros.d/scripts/pack_sourcesrpkglib/preproc/scripts/pack_sources.sh
file renamed
+0 -0
macros/rpkg-macros.spec.rpkg
file added
+66
macros/tests/READMEtests/preproc/README
file renamed
+0 -0
macros/tests/inputtests/preproc/input
file renamed
+0 -0
macros/tests/lib.shtests/preproc/lib.sh
file renamed
+12 -12
macros/tests/preproc.pytests/preproc/preproc.py
file renamed
+0 -0
macros/tests/run.shtests/preproc/run.sh
file renamed
+5 -5
macros/tests/test_bash/inputtests/preproc/test_bash/input
file renamed
+0 -0
macros/tests/test_bash/logtests/preproc/test_bash/log
file renamed
+0 -0
macros/tests/test_bash/outputtests/preproc/test_bash/output
file renamed
+0 -0
macros/tests/test_bash/run.shtests/preproc/test_bash/run.sh
file renamed
+3 -1
macros/tests/test_bumped_version/inputtests/preproc/test_bumped_version/input
file renamed
+0 -0
macros/tests/test_bumped_version/logtests/preproc/test_bumped_version/log
file renamed
+0 -0
macros/tests/test_bumped_version/outputtests/preproc/test_bumped_version/output
file renamed
+0 -0
macros/tests/test_bumped_version/run.shtests/preproc/test_bumped_version/run.sh
file renamed
+3 -1
macros/tests/test_committed/logtests/preproc/test_committed/log
file renamed
+0 -0
macros/tests/test_committed/outputtests/preproc/test_committed/output
file renamed
+0 -0
macros/tests/test_committed/run.shtests/preproc/test_committed/run.sh
file renamed
+3 -1
macros/tests/test_dirty/logtests/preproc/test_dirty/log
file renamed
+0 -0
macros/tests/test_dirty/outputtests/preproc/test_dirty/output
file renamed
+0 -0
macros/tests/test_dirty/run.shtests/preproc/test_dirty/run.sh
file renamed
+3 -1
macros/tests/test_inited/logtests/preproc/test_inited/log
file renamed
+0 -0
macros/tests/test_inited/outputtests/preproc/test_inited/output
file renamed
+0 -0
macros/tests/test_inited/run.shtests/preproc/test_inited/run.sh
file renamed
+3 -1
macros/tests/test_inited_origin_set/logtests/preproc/test_inited_origin_set/log
file renamed
+0 -0
macros/tests/test_inited_origin_set/outputtests/preproc/test_inited_origin_set/output
file renamed
+0 -0
macros/tests/test_inited_origin_set/run.shtests/preproc/test_inited_origin_set/run.sh
file renamed
+3 -1
macros/tests/test_sources/inputtests/preproc/test_sources/input
file renamed
+0 -0
macros/tests/test_sources/logtests/preproc/test_sources/log
file renamed
+0 -0
macros/tests/test_sources/outputtests/preproc/test_sources/output
file renamed
+0 -0
macros/tests/test_sources/run.shtests/preproc/test_sources/run.sh
file renamed
+5 -4
macros/tests/test_sources_committed/inputtests/preproc/test_sources_committed/input
file renamed
+0 -0
macros/tests/test_sources_committed/logtests/preproc/test_sources_committed/log
file renamed
+0 -0
macros/tests/test_sources_committed/outputtests/preproc/test_sources_committed/output
file renamed
+0 -0
macros/tests/test_sources_committed/run.shtests/preproc/test_sources_committed/run.sh
file renamed
+7 -6
macros/tests/test_sources_subdir/inputtests/preproc/test_sources_subdir/input
file renamed
+0 -0
macros/tests/test_sources_subdir/logtests/preproc/test_sources_subdir/log
file renamed
+0 -0
macros/tests/test_sources_subdir/outputtests/preproc/test_sources_subdir/output
file renamed
+0 -0
macros/tests/test_sources_subdir/run.sh
file added
+72
macros/tests/test_subdir/logtests/preproc/test_subdir/log
file renamed
+0 -0
macros/tests/test_subdir/outputtests/preproc/test_subdir/output
file renamed
+0 -0
macros/tests/test_subdir/run.shtests/preproc/test_subdir/run.sh
file renamed
+3 -1
macros/tests/test_tagged/logtests/preproc/test_tagged/log
file renamed
+0 -0
macros/tests/test_tagged/outputtests/preproc/test_tagged/output
file renamed
+0 -0
macros/tests/test_tagged/run.shtests/preproc/test_tagged/run.sh
file renamed
+3 -1
macros/tests/test_tagged_committed/logtests/preproc/test_tagged_committed/log
file renamed
+0 -0
macros/tests/test_tagged_committed/outputtests/preproc/test_tagged_committed/output
file renamed
+0 -0
macros/tests/test_tagged_committed/run.shtests/preproc/test_tagged_committed/run.sh
file renamed
+3 -1
macros/tests/test_uninited/logtests/preproc/test_uninited/log
file renamed
+0 -0
macros/tests/test_uninited/outputtests/preproc/test_uninited/output
file renamed
+0 -0
macros/tests/test_uninited/run.shtests/preproc/test_uninited/run.sh
file renamed
+3 -1
man/rpkg_man_page.py
file modified
+4 -0
preproc/LICENSE
file added
+339
preproc/preproc
file added
+123
preproc/preproc.spec.rpkg
file added
+66
rpkg-util.spec.rpkg
file modified
+8 -13
rpkglib/__init__.py
file modified
+25 -3
rpkglib/preproc.py
file removed
-97
rpkglib/preproc/setup
file removed
-22
run_tests.sh
file modified
+0 -4
setup.py
file modified
+0 -1
tests/preproc/test_sources_subdir/run.sh
file removed
-71
    move preproc and rpkg macro defs into separate packages
    
    * preproc is now a generic command-line utility
    * rpkg macros are preproc macros placed at /usr/lib/rpkg.macros.d
      to be used in rpm spec files
    * rpkg calls preproc -s /usr/lib/rpkg.macros.d/all.bash to
      preprocess the spec files containing the macros
    
        
file added
+339
macros/examples/git.spec.rpkg examples/simple-template.spec.rpkg
file renamed
file was renamed with no change to the file
macros/examples/git_cwd.spec.rpkg examples/simple-template-cwd.spec.rpkg
file renamed
file was renamed with no change to the file
macros/examples/git_dir.spec.rpkg examples/simple-template-dir.spec.rpkg
file renamed
file was renamed with no change to the file
macros/macros.d/git.bash rpkglib/preproc/lib.sh
file renamed
+10 -9
macros/macros.d/scripts/pack_sources rpkglib/preproc/scripts/pack_sources.sh
file renamed
file was renamed with no change to the file
macros/tests/README tests/preproc/README
file renamed
file was renamed with no change to the file
macros/tests/input tests/preproc/input
file renamed
file was renamed with no change to the file
macros/tests/lib.sh tests/preproc/lib.sh
file renamed
+12 -12
macros/tests/preproc.py tests/preproc/preproc.py
file renamed
file was renamed with no change to the file
macros/tests/run.sh tests/preproc/run.sh
file renamed
+5 -5
macros/tests/test_bash/input tests/preproc/test_bash/input
file renamed
file was renamed with no change to the file
macros/tests/test_bash/log tests/preproc/test_bash/log
file renamed
file was renamed with no change to the file
macros/tests/test_bash/output tests/preproc/test_bash/output
file renamed
file was renamed with no change to the file
macros/tests/test_bash/run.sh tests/preproc/test_bash/run.sh
file renamed
+3 -1
macros/tests/test_bumped_version/input tests/preproc/test_bumped_version/input
file renamed
file was renamed with no change to the file
macros/tests/test_bumped_version/log tests/preproc/test_bumped_version/log
file renamed
file was renamed with no change to the file
macros/tests/test_bumped_version/output tests/preproc/test_bumped_version/output
file renamed
file was renamed with no change to the file
macros/tests/test_bumped_version/run.sh tests/preproc/test_bumped_version/run.sh
file renamed
+3 -1
macros/tests/test_committed/log tests/preproc/test_committed/log
file renamed
file was renamed with no change to the file
macros/tests/test_committed/output tests/preproc/test_committed/output
file renamed
file was renamed with no change to the file
macros/tests/test_committed/run.sh tests/preproc/test_committed/run.sh
file renamed
+3 -1
macros/tests/test_dirty/log tests/preproc/test_dirty/log
file renamed
file was renamed with no change to the file
macros/tests/test_dirty/output tests/preproc/test_dirty/output
file renamed
file was renamed with no change to the file
macros/tests/test_dirty/run.sh tests/preproc/test_dirty/run.sh
file renamed
+3 -1
macros/tests/test_inited/log tests/preproc/test_inited/log
file renamed
file was renamed with no change to the file
macros/tests/test_inited/output tests/preproc/test_inited/output
file renamed
file was renamed with no change to the file
macros/tests/test_inited/run.sh tests/preproc/test_inited/run.sh
file renamed
+3 -1
macros/tests/test_inited_origin_set/log tests/preproc/test_inited_origin_set/log
file renamed
file was renamed with no change to the file
macros/tests/test_inited_origin_set/output tests/preproc/test_inited_origin_set/output
file renamed
file was renamed with no change to the file
macros/tests/test_inited_origin_set/run.sh tests/preproc/test_inited_origin_set/run.sh
file renamed
+3 -1
macros/tests/test_sources/input tests/preproc/test_sources/input
file renamed
file was renamed with no change to the file
macros/tests/test_sources/log tests/preproc/test_sources/log
file renamed
file was renamed with no change to the file
macros/tests/test_sources/output tests/preproc/test_sources/output
file renamed
file was renamed with no change to the file
macros/tests/test_sources/run.sh tests/preproc/test_sources/run.sh
file renamed
+5 -4
macros/tests/test_sources_committed/input tests/preproc/test_sources_committed/input
file renamed
file was renamed with no change to the file
macros/tests/test_sources_committed/log tests/preproc/test_sources_committed/log
file renamed
file was renamed with no change to the file
macros/tests/test_sources_committed/output tests/preproc/test_sources_committed/output
file renamed
file was renamed with no change to the file
macros/tests/test_sources_committed/run.sh tests/preproc/test_sources_committed/run.sh
file renamed
+7 -6
macros/tests/test_sources_subdir/input tests/preproc/test_sources_subdir/input
file renamed
file was renamed with no change to the file
macros/tests/test_sources_subdir/log tests/preproc/test_sources_subdir/log
file renamed
file was renamed with no change to the file
macros/tests/test_sources_subdir/output tests/preproc/test_sources_subdir/output
file renamed
file was renamed with no change to the file
macros/tests/test_subdir/log tests/preproc/test_subdir/log
file renamed
file was renamed with no change to the file
macros/tests/test_subdir/output tests/preproc/test_subdir/output
file renamed
file was renamed with no change to the file
macros/tests/test_subdir/run.sh tests/preproc/test_subdir/run.sh
file renamed
+3 -1
macros/tests/test_tagged/log tests/preproc/test_tagged/log
file renamed
file was renamed with no change to the file
macros/tests/test_tagged/output tests/preproc/test_tagged/output
file renamed
file was renamed with no change to the file
macros/tests/test_tagged/run.sh tests/preproc/test_tagged/run.sh
file renamed
+3 -1
macros/tests/test_tagged_committed/log tests/preproc/test_tagged_committed/log
file renamed
file was renamed with no change to the file
macros/tests/test_tagged_committed/output tests/preproc/test_tagged_committed/output
file renamed
file was renamed with no change to the file
macros/tests/test_tagged_committed/run.sh tests/preproc/test_tagged_committed/run.sh
file renamed
+3 -1
macros/tests/test_uninited/log tests/preproc/test_uninited/log
file renamed
file was renamed with no change to the file
macros/tests/test_uninited/output tests/preproc/test_uninited/output
file renamed
file was renamed with no change to the file
macros/tests/test_uninited/run.sh tests/preproc/test_uninited/run.sh
file renamed
+3 -1
file modified
+4 -0
file added
+339
file added
+123
file modified
+8 -13
file modified
+25 -3
file removed
-97
file removed
-22
file modified
+0 -4
file modified
+0 -1