diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-02-09 22:49:53 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-02-09 22:49:53 +0000 |
| commit | 6c6fe7cac399ce58bdc6ba065bd6fee87c56046b (patch) | |
| tree | e579384fbc7154989a09487a1a1f6be90f552af7 /pki/base/console | |
| parent | e9d29c4cee640e9279cd0d884e4e86749b267940 (diff) | |
| download | pki-6c6fe7cac399ce58bdc6ba065bd6fee87c56046b.tar.gz pki-6c6fe7cac399ce58bdc6ba065bd6fee87c56046b.tar.xz pki-6c6fe7cac399ce58bdc6ba065bd6fee87c56046b.zip | |
Bugzilla Bug #562986 - Supply convenience symlink(s) for backwards
compatibility (rename jar files as appropriate)
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@968 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/console')
| -rw-r--r-- | pki/base/console/build.xml | 13 | ||||
| -rwxr-xr-x | pki/base/console/templates/pki_console_wrapper | 5 |
2 files changed, 7 insertions, 11 deletions
diff --git a/pki/base/console/build.xml b/pki/base/console/build.xml index 56cc3898..f79babca 100644 --- a/pki/base/console/build.xml +++ b/pki/base/console/build.xml @@ -86,12 +86,12 @@ </fileset> </copy> <mkdir dir="${build.jars}"/> - <jar jarfile="${build.jars}/console-cms-${version}.jar"> + <jar jarfile="${build.jars}/pki-console-${version}.jar"> <fileset dir="${build.classes}"> <include name="com/netscape/**"/> </fileset> </jar> - <jar jarfile="${build.jars}/console-cms-${version}_en.jar"> + <jar jarfile="${build.jars}/pki-console-${version}_en.jar"> <fileset dir="."> <include name="CMSAdminRS.properties"/> </fileset> @@ -179,18 +179,13 @@ <echo message="${begin.binary.zip.log.message}"/> <copy file="./templates/pki_console_wrapper" tofile="./build/pkiconsole"/> - <exec executable="sed"> - <arg value="-i"/> - <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/> - <arg value="./build/pkiconsole"/> - </exec> <echo message="${end.binary.zip.log.message}"/> <echo message="${begin.binary.tar.log.message}"/> <zip destfile="${dist.base.binaries}/${dist.name}.zip"> <zipfileset dir="./build/jars" filemode="755" - prefix="usr/share/java/${product.prefix}"> + prefix="usr/share/java"> <include name="**"/> </zipfileset> <zipfileset dir="./build" @@ -212,7 +207,7 @@ destfile="${dist.base.binaries}/${dist.name}.tar"> <tarfileset dir="./build/jars" mode="755" - prefix="${dist.name}/usr/share/java/${product.prefix}"> + prefix="${dist.name}/usr/share/java"> <include name="**"/> </tarfileset> <tarfileset dir="./build" diff --git a/pki/base/console/templates/pki_console_wrapper b/pki/base/console/templates/pki_console_wrapper index 467b31bc..aed16d10 100755 --- a/pki/base/console/templates/pki_console_wrapper +++ b/pki/base/console/templates/pki_console_wrapper @@ -152,8 +152,9 @@ CP=/usr/share/java/idm-console-mcc_en.jar:${CP} CP=/usr/share/java/idm-console-base.jar:${CP} CP=/usr/share/java/fedora-idm-console_en.jar:${CP} CP=/usr/share/java/${PRODUCT}/cms-theme_en.jar:${CP} -CP=/usr/share/java/${PRODUCT}/console-cms_en.jar:${CP} -CP=/usr/share/java/${PRODUCT}/console-cms.jar:${CP} +CP=/usr/share/java/pki-console-theme_en.jar:${CP} +CP=/usr/share/java/pki-console_en.jar:${CP} +CP=/usr/share/java/pki-console.jar:${CP} CP=/usr/share/${PRODUCT}/classes:${CP} export CP |