diff options
| author | midipix <writeonce@midipix.org> | 2016-04-09 19:54:53 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-04-09 19:54:53 -0400 |
| commit | 9aa1f4b19f4d7a635c744f4241ec64a7745bd83a (patch) | |
| tree | fd03d19ed55c12ef1c9f191a4cf922fceedd6752 | |
| parent | 258073e76ddf4030ff9d6385caf6af7d0c609a3f (diff) | |
| download | slibtool-9aa1f4b19f4d7a635c744f4241ec64a7745bd83a.tar.bz2 slibtool-9aa1f4b19f4d7a635c744f4241ec64a7745bd83a.tar.xz | |
driver: added -release support.
| -rw-r--r-- | include/slibtool/slibtool.h | 1 | ||||
| -rw-r--r-- | src/driver/slbt_driver_ctx.c | 8 | ||||
| -rw-r--r-- | src/internal/slibtool_driver_impl.h | 1 | ||||
| -rw-r--r-- | src/skin/slbt_skin_default.c | 4 |
4 files changed, 14 insertions, 0 deletions
diff --git a/include/slibtool/slibtool.h b/include/slibtool/slibtool.h index fc29bef..dbc6897 100644 --- a/include/slibtool/slibtool.h +++ b/include/slibtool/slibtool.h @@ -154,6 +154,7 @@ struct slbt_common_ctx { const char * output; char * libname; const char * rpath; + const char * release; char ** targv; char ** cargv; }; diff --git a/src/driver/slbt_driver_ctx.c b/src/driver/slbt_driver_ctx.c index 1d87ebd..726bb12 100644 --- a/src/driver/slbt_driver_ctx.c +++ b/src/driver/slbt_driver_ctx.c @@ -235,6 +235,10 @@ static int slbt_split_argv( *targv++ = argv[i++]; *targv++ = argv[i]; + } else if (!(strcmp("release",&argv[i][1]))) { + *targv++ = argv[i++]; + *targv++ = argv[i]; + } else if (!(strcmp("version-info",&argv[i][1]))) { *targv++ = argv[i++]; *targv++ = argv[i]; @@ -679,6 +683,10 @@ int slbt_get_driver_ctx( cctx.rpath = entry->arg; break; + case TAG_RELEASE: + cctx.release = entry->arg; + break; + case TAG_VERSION_INFO: cctx.verinfo.verinfo = entry->arg; break; diff --git a/src/internal/slibtool_driver_impl.h b/src/internal/slibtool_driver_impl.h index 6798ed9..fbb6d3b 100644 --- a/src/internal/slibtool_driver_impl.h +++ b/src/internal/slibtool_driver_impl.h @@ -33,6 +33,7 @@ enum app_tags { TAG_DLLTOOL, TAG_OUTPUT, TAG_RPATH, + TAG_RELEASE, TAG_VERSION_INFO, TAG_NO_SUPPRESS, TAG_PREFER_PIC, diff --git a/src/skin/slbt_skin_default.c b/src/skin/slbt_skin_default.c index e5f2648..7c421f6 100644 --- a/src/skin/slbt_skin_default.c +++ b/src/skin/slbt_skin_default.c @@ -86,6 +86,10 @@ const struct argv_option slbt_default_options[] = { "where a library should eventually be " "installed, relative to $(DESTDIR)$(PREFIX)"}, + {"release", 0,TAG_RELEASE,ARGV_OPTARG_REQUIRED, + ARGV_OPTION_HYBRID_ONLY|ARGV_OPTION_HYBRID_SPACE,0,0, + "specify release information"}, + {"version-info", 0,TAG_VERSION_INFO,ARGV_OPTARG_REQUIRED, ARGV_OPTION_HYBRID_ONLY|ARGV_OPTION_HYBRID_SPACE,0, "<current>[:<revision>[:<age>]]", |