[Pkg-fedora-ds-maintainers] 389-console: Changes to 'upstream'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Thu May 7 10:11:07 UTC 2015
.gitignore | 1
389-console.8 | 78 +++++++++++++++++++++++++++++++++++++++
389-console.spec | 17 +++-----
build.properties | 2 -
build.xml | 17 ++++++--
fedora-idm-console.spec | 12 +-----
sources | 1
win/Console.wxs | 95 +++++++++++++++++++++++++++---------------------
win/Makefile | 43 +++++++++++++--------
win/VERSION.mak | 4 +-
win/build.bat | 19 ++++++---
11 files changed, 197 insertions(+), 92 deletions(-)
New commits:
commit 1072cfbea509457d9a4af429922d21e4dc824a2b
Author: Noriko Hosoi <nhosoi at redhat.com>
Date: Thu Feb 5 10:45:05 2015 -0800
Bump version to 1.1.9
diff --git a/build.properties b/build.properties
index 573b943..a2ed0c1 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
console.root=.
console.version=11
-console.dotversion=1.1.8
+console.dotversion=1.1.9
console.dotgenversion=1.1
theme.core=389-console
commit 989193207e2af04e2cbe5b853c09b0ec91e5dd55
Author: Noriko Hosoi <nhosoi at redhat.com>
Date: Mon Dec 22 14:04:32 2014 -0800
Ticket 97 - 389-console should provide man page
Additional fix: ${man.dir} needs to be prepared in the build tree.
diff --git a/.gitignore b/.gitignore
index b25c15b..3596ea5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
*~
+/389-console-1.1.8.tar.bz2
diff --git a/build.xml b/build.xml
index 5ca1dd8..8f7c4e0 100644
--- a/build.xml
+++ b/build.xml
@@ -42,6 +42,9 @@ END COPYRIGHT BLOCK
<property name="need_libdir" value=""/>
<property name="man.dir" value="/usr/share/man"/>
+ <mkdir dir="${man.dir}"/>
+ <mkdir dir="${man.dir}/man.8"/>
+
<!-- Verify that the required jars exist -->
<fail message="LDAP JDK (${ldapjdk.jar.name}) does not exist in ${ldapjdk.local.location}">
Please set the correct location with -Dldapjdk.local.location=[path]
diff --git a/sources b/sources
new file mode 100644
index 0000000..4de6e57
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+9827b13c93cb9a9f7572779cf1209dd5 389-console-1.1.8.tar.bz2
commit 5c2623f16d0899af6bfbaf231ec7db2a6153c4f9
Author: Mark Reynolds <mreynolds at redhat.com>
Date: Mon Nov 10 17:01:52 2014 -0500
Bump version to 1.1.8
diff --git a/build.properties b/build.properties
index 0eba3cc..573b943 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
console.root=.
console.version=11
-console.dotversion=1.1.7
+console.dotversion=1.1.8
console.dotgenversion=1.1
theme.core=389-console
commit 63be739dc92ed6437bca2eb250ce024548243420
Author: Mark Reynolds <mreynolds at redhat.com>
Date: Fri Aug 29 11:50:09 2014 -0400
Ticket 47604 - 389-console: remove versioned jars from %{_javadir}
Bug Description: Versioned files cause problems for automatic
requires generation and violate packaging guidelines.
Fix Description: Remove the version from the jar files. The spec files
are just a template, the real spec files will be updated
separately.
https://fedorahosted.org/389/ticket/47604
Reviewed by: rmeggins(Thanks!)
diff --git a/389-console.spec b/389-console.spec
index 9f5100c..46d3d47 100755
--- a/389-console.spec
+++ b/389-console.spec
@@ -1,5 +1,5 @@
%define major_version 1.1
-%define minor_version 3
+%define minor_version 7
Name: 389-console
Version: %{major_version}.%{minor_version}
@@ -12,7 +12,7 @@ URL: http://port389.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source: http://port389.org/binaries/%{name}-%{version}.tar.bz2
Requires: idm-console-framework >= 1.1
Requires: java >= 1:1.6.0
BuildRequires: ant >= 1.6.2
@@ -47,20 +47,12 @@ install -m755 built/%{name} $RPM_BUILD_ROOT/%{_bindir}
install -d $RPM_BUILD_ROOT%{_mandir}/man8
install -m built%{_mandir}/man8/* $RPM_BUILD_ROOT%{_mandir}/man8
-# create symlinks
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
-ln -s %{name}-%{version}_en.jar %{name}_en.jar
-popd
-
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc LICENSE
-%{_javadir}/%{name}-%{version}_en.jar
-%{_javadir}/%{name}-%{major_version}_en.jar
%{_javadir}/%{name}_en.jar
%{_bindir}/%{name}
%{_mandir}
diff --git a/build.xml b/build.xml
index 2e4a4ab..5ca1dd8 100644
--- a/build.xml
+++ b/build.xml
@@ -91,7 +91,7 @@ END COPYRIGHT BLOCK
<target name="buildjar" depends="prepare">
<!-- Create the theme jar file -->
- <jar jarfile="${built.dir}/${theme.name}_${lang}.jar" >
+ <jar jarfile="${built.dir}/${theme.core}_${lang}.jar" >
<fileset dir="${console.root}">
<include name="com/netscape/management/client/theme/**" />
<exclude name="com/netscape/management/client/theme/**/*.xcf" />
@@ -111,7 +111,7 @@ END COPYRIGHT BLOCK
<replacefilter token="@mcclangjar@" value="${console.mcc.name}_${lang}.jar"/>
<replacefilter token="@nmclfjar@" value="${console.nmclf.name}.jar"/>
<replacefilter token="@nmclflangjar@" value="${console.nmclf.name}_${lang}.jar"/>
- <replacefilter token="@themejar@" value="${theme.name}_${lang}.jar"/>
+ <replacefilter token="@themejar@" value="${theme.core}_${lang}.jar"/>
<replacefilter token="@prefsdir@" value="${theme.core}"/>
<replacefilter token="@libdir@" value="${lib.dir}"/>
<replacefilter token="@need_libdir@" value="${need_libdir}"/>
diff --git a/fedora-idm-console.spec b/fedora-idm-console.spec
index 8b2dedc..aec831e 100755
--- a/fedora-idm-console.spec
+++ b/fedora-idm-console.spec
@@ -1,5 +1,5 @@
%define major_version 1.1
-%define minor_version 3
+%define minor_version 7
Name: fedora-idm-console
Version: %{major_version}.%{minor_version}
@@ -11,7 +11,7 @@ License: LGPLv2
URL: http://directory.fedoraproject.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
+Source: http://port389.org/binaries/%{name}-%{version}.tar.bz2
Requires: idm-console-framework >= 1.1
Requires: java >= 1:1.6.0
BuildRequires: ant >= 1.6.2
@@ -39,20 +39,12 @@ install -m644 built/*.jar $RPM_BUILD_ROOT%{_javadir}
install -d $RPM_BUILD_ROOT%{_bindir}
install -m755 built/%{name} $RPM_BUILD_ROOT/%{_bindir}
-# create symlinks
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
-ln -s %{name}-%{version}_en.jar %{name}_en.jar
-popd
-
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc LICENSE
-%{_javadir}/%{name}-%{version}_en.jar
-%{_javadir}/%{name}-%{major_version}_en.jar
%{_javadir}/%{name}_en.jar
%{_bindir}/%{name}
commit 23e0e74c245604e69f2153c48028fde3aee2103a
Author: Mark Reynolds <mreynolds at redhat.com>
Date: Tue Aug 26 10:34:25 2014 -0400
Ticket 97 - 389-console should provide man page
Bug Description: The console is missing a man page.
Fix Description: Add man page, and deploy it the man8 directory.
https://fedorahosted.org/389/ticket/97
Reviewed by: rmeggins & nhosoi(Thanks!!)
diff --git a/389-console.8 b/389-console.8
new file mode 100644
index 0000000..6230e90
--- /dev/null
+++ b/389-console.8
@@ -0,0 +1,78 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH 389-console 8 "Aug 25, 2014"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+389-console - The 389 Directory Server UI
+.SH SYNOPSIS
+389-console [-a <URL>] [-A <local URL>] [-D <debug level>] [-f <output file>] [-h]
+[-l <Language Code>] [-s <SIE DN>] [-u <username/Bind DN>] [-w <password> | - (prompt for password)]
+[-x <options>] [-y <password file>]
+.SH DESCRIPTION
+A Java based remote management console used for Managing the Directory Server and Administration Server.
+.SH OPTIONS
+A summary of options is included below:
+.TP
+.B \fB\-a\fR \fIURL\fR
+Administration Server base URL.
+.TP
+.B \fB\-A\fR \fIURL\fR
+Local Administration Server URL.
+.TP
+.B \fB\-D\fR \fIDebug_Level\fR
+Debug level: 1 - 9
+.TP
+.B \fB\-f\fR \fIDebug_Output_File\fR
+Specifies the output file for the debug logging.
+.TP
+.B \fB\-h\fR
+.br
+Display usage.
+.TP
+.B \fB\-l\fR \fILanguage code\fR
+Language code.
+.TP
+.B \fB\-s\fR \fIServer DN/Identifier\fR
+server DN (cn=...) or instance ID (e.g. slapd-host)
+.TP
+.B \fB\-u\fR \fIusername/BiNd DN\fR
+The user name or bind DN to log into the console.
+.TP
+.B \fB\-w\fR \fIpassword\fR
+Password for the bind DN specified with the -u option.
+.TP
+.B \fB\-w\fR \fB\\\-\fR
+.br
+Prompt for the user password.
+.TP
+.B \fB\-x\fR \fIOption\fR
+Extra options (javalaf, nowinpos, nologo)
+.TP
+.B \fB\-y\fR \fIPassword_File\fR
+File containing user password.
+
+.SH EXAMPLE
+.TP
+389-console -a http://host.domain.com:9830 -u "cn=directory manager" -f ./passwd.txt -l en
+.TP
+389-console -D 9 -f /tmp/debug-output.txt -x nologo
+
+.SH AUTHOR
+389-console was written by the 389 Project.
+.SH "REPORTING BUGS"
+Report bugs to http://bugzilla.redhat.com.
+.SH COPYRIGHT
+Copyright \(co 2014 Red Hat, Inc.
diff --git a/389-console.spec b/389-console.spec
index 3ed2811..9f5100c 100755
--- a/389-console.spec
+++ b/389-console.spec
@@ -32,7 +32,7 @@ Administration Server and 389 Directory Server.
%build
%{ant} \
- -Dbuilt.dir=`pwd`/built
+ -Dbuilt.dir=`pwd`/built -Dman.dir=`pwd`/built%{_mandir}
# add -Dlib.dir and -Dneed_libdir on those platforms where
# jss is installed in a non-standard location
@@ -44,6 +44,8 @@ install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 built/*.jar $RPM_BUILD_ROOT%{_javadir}
install -d $RPM_BUILD_ROOT%{_bindir}
install -m755 built/%{name} $RPM_BUILD_ROOT/%{_bindir}
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+install -m built%{_mandir}/man8/* $RPM_BUILD_ROOT%{_mandir}/man8
# create symlinks
pushd $RPM_BUILD_ROOT%{_javadir}
@@ -61,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/%{name}-%{major_version}_en.jar
%{_javadir}/%{name}_en.jar
%{_bindir}/%{name}
+%{_mandir}
%changelog
* Wed May 13 2009 Rich Megginson <rmeggins at redhat.com> 1.1.3-2
diff --git a/build.xml b/build.xml
index 5cb516f..2e4a4ab 100644
--- a/build.xml
+++ b/build.xml
@@ -40,6 +40,7 @@ END COPYRIGHT BLOCK
<property name="console.local.location" value="/usr/share/java"/>
<property name="lib.dir" value="/usr/lib"/>
<property name="need_libdir" value=""/>
+ <property name="man.dir" value="/usr/share/man"/>
<!-- Verify that the required jars exist -->
<fail message="LDAP JDK (${ldapjdk.jar.name}) does not exist in ${ldapjdk.local.location}">
@@ -85,8 +86,8 @@ END COPYRIGHT BLOCK
</target>
<!-- Build -->
- <target name="build" depends="prepare,buildjar,buildscript"/>
- <target name="buildnoscript" depends="prepare,buildjar"/>
+ <target name="build" depends="prepare,buildjar,buildscript,buildman"/>
+ <target name="buildnoscript" depends="prepare,buildjar,buildman"/>
<target name="buildjar" depends="prepare">
<!-- Create the theme jar file -->
@@ -116,4 +117,9 @@ END COPYRIGHT BLOCK
<replacefilter token="@need_libdir@" value="${need_libdir}"/>
</replace>
</target>
+ <target name="buildman">
+ <!-- Man Page -->
+ <copy file="389-console.8" tofile="${man.dir}/man8/389-console.8"/>
+ <chmod file="${man.dir}/man8/389-console.8" perm="644"/>
+ </target>
</project>
commit c8d5cc5f1b941f34a19d33526113f2a71290423c
Author: Rich Megginson <rmeggins at redhat.com>
Date: Wed Jun 22 14:42:35 2011 -0600
port to wix 3.0 from mozilla-build - use idm console 1.1.7
Port build to use wix 3.0 from the mozilla-build package
Use idm-console-framework 1.1.7
Allow building without the SxS merge modules since they are no longer
provided with the free or "cheap" versions of the Microsoft compiler
toolkits - this is for developers only to test with
diff --git a/win/Console.wxs b/win/Console.wxs
index 8e9043d..6ceb669 100644
--- a/win/Console.wxs
+++ b/win/Console.wxs
@@ -46,14 +46,14 @@
<?endif ?>
<?define EMPTY = "" ?>
-<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='$(var.PRODUCTNAME)' Id='$(var.PKGGUID)'
Language='1033' Codepage='1252' UpgradeCode='$(var.UPGRADEGUID)'
Version='$(var.VERSION)' Manufacturer='$(var.VENDOR)'>
- <Package Id='????????-????-????-????-????????????' Keywords='Installer'
+ <Package Id='*' Keywords='Installer'
Description="$(var.PRODUCTNAME) Installer"
- Manufacturer='$(var.VENDOR)' Platforms='$(var.Property_Platform)'
+ Manufacturer='$(var.VENDOR)'
InstallerVersion='200' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<!-- previous versions of this package were installed using the per-user context -->
@@ -136,130 +136,137 @@
<Directory Id='TARGETDIR' Name='SourceDir'>
<!-- the VC runtime redist package -->
- <Merge Id='CRT' Language='0' src='$(var.CRTMSM)' DiskId='1'/>
- <Merge Id='PolicyCRT' Language='0' src='$(var.POLICYCRTMSM)' DiskId='1'/>
+<?if $(var.CRTMSM) AND ($(var.CRTMSM) != $(var.EMPTY)) ?>
+ <Merge Id='CRT' Language='0' SourceFile='$(var.CRTMSM)' DiskId='1'/>
+<?endif ?>
+<?if $(var.POLICYCRTMSM) AND ($(var.POLICYCRTMSM) != $(var.EMPTY)) ?>
+ <Merge Id='PolicyCRT' Language='0' SourceFile='$(var.POLICYCRTMSM)' DiskId='1'/>
+<?endif ?>
<Directory Id='$(var.Property_PFilesFolder)' Name='PFiles'>
- <Directory Id='INSTALLDIR' Name='CONFLDR' LongName='$(var.PRODUCTNAME)'>
+ <Directory Id='INSTALLDIR' Name='$(var.PRODUCTNAME)'>
<Component Id='NSPRLibrary' Guid='DE133754-3C99-49e7-8A71-0375AB348CDD' Win64='$(var.Property_Win64)'>
- <File Id='NSPR' LongName='libnspr4.dll' Name='libnspr4.dll' DiskId='1' src='libnspr4.dll' Vital='yes' />
+ <File Id='NSPR' DiskId='1' Source='libnspr4.dll' Vital='yes' />
</Component>
<Component Id='NSPRpldsLibrary' Guid='7DCDBD30-DC5B-4c89-BD94-EE55E1D9D082' Win64='$(var.Property_Win64)'>
- <File Id='NSPRPLDS' LongName='libplds4.dll' Name='libplds4.dll' DiskId='1' src='libplds4.dll' Vital='yes' />
+ <File Id='NSPRPLDS' DiskId='1' Source='libplds4.dll' Vital='yes' />
</Component>
<Component Id='NSPRplcLibrary' Guid='4E707871-BA8E-41e2-982E-E3E79E85A599' Win64='$(var.Property_Win64)'>
- <File Id='NSPRPLC' LongName='libplc4.dll' Name='libplc4.dll' DiskId='1' src='libplc4.dll' Vital='yes' />
+ <File Id='NSPRPLC' DiskId='1' Source='libplc4.dll' Vital='yes' />
</Component>
<Component Id='NSSLibrary' Guid='3196F339-901E-42c4-AAD3-704775DCF5F4' Win64='$(var.Property_Win64)'>
- <File Id='NSS' LongName='nss3.dll' Name='nss3.dll' DiskId='1' src='nss3.dll' Vital='yes' />
+ <File Id='NSS' DiskId='1' Source='nss3.dll' Vital='yes' />
</Component>
<Component Id='NSSsslLibrary' Guid='004E7F81-77E8-4681-810B-E97EC9BE49F2' Win64='$(var.Property_Win64)'>
- <File Id='NSSSSL' LongName='ssl3.dll' Name='ssl3.dll' DiskId='1' src='ssl3.dll' Vital='yes' />
+ <File Id='NSSSSL' DiskId='1' Source='ssl3.dll' Vital='yes' />
</Component>
<Component Id='NSSsoftoknLibrary' Guid='B20D5FB4-B985-4c44-B4AA-8657C74B8061' Win64='$(var.Property_Win64)'>
- <File Id='NSSSOFTTOKN' LongName='softokn3.dll' Name='softokn3.dll' DiskId='1' src='softokn3.dll' Vital='yes' />
+ <File Id='NSSSOFTTOKN' DiskId='1' Source='softokn3.dll' Vital='yes' />
</Component>
<Component Id='NSSsmimeLibrary' Guid='84BD3153-5E80-4556-9B6C-C67B13B3BEA9' Win64='$(var.Property_Win64)'>
- <File Id='NSSSMIME' LongName='smime3.dll' Name='smime3.dll' DiskId='1' src='smime3.dll' Vital='yes' />
+ <File Id='NSSSMIME' DiskId='1' Source='smime3.dll' Vital='yes' />
</Component>
<Component Id='NSSfreeblLibrary' Guid='69D9F77F-27EA-4820-B931-07538AFC75FD' Win64='$(var.Property_Win64)'>
- <File Id='NSSFREEBL' LongName='freebl3.dll' Name='freebl3.dll' DiskId='1' src='freebl3.dll' Vital='yes' />
+ <File Id='NSSFREEBL' DiskId='1' Source='freebl3.dll' Vital='yes' />
</Component>
<Component Id='NSSutilLibrary' Guid='FCFD9F8C-E567-46eb-90C3-A9322E862A2C' Win64='$(var.Property_Win64)'>
- <File Id='NSSUTIL' LongName='nssutil3.dll' Name='nssutil3.dll' DiskId='1' src='nssutil3.dll' Vital='yes' />
+ <File Id='NSSUTIL' DiskId='1' Source='nssutil3.dll' Vital='yes' />
</Component>
<Component Id='NSSsqliteLibrary' Guid='4A8645BA-7A78-44f5-8073-7F2BE8C13622' Win64='$(var.Property_Win64)'>
- <File Id='NSSSQLITE' LongName='sqlite3.dll' Name='sqlite3.dll' DiskId='1' src='sqlite3.dll' Vital='yes' />
+ <File Id='NSSSQLITE' DiskId='1' Source='sqlite3.dll' Vital='yes' />
</Component>
<Component Id='NSSdbmLibrary' Guid='7BDF98E8-D1D5-4b06-AB69-1688EE7A6872' Win64='$(var.Property_Win64)'>
- <File Id='NSSDBM' LongName='nssdbm3.dll' Name='nssdbm3.dll' DiskId='1' src='nssdbm3.dll' Vital='yes' />
+ <File Id='NSSDBM' DiskId='1' Source='nssdbm3.dll' Vital='yes' />
</Component>
<Component Id='NSSrootcertsLibrary' Guid='B3350485-7CDD-4311-99F6-479DA1FA92A1' Win64='$(var.Property_Win64)'>
- <File Id='NSSROOTCERTS' LongName='nssckbi.dll' Name='nssckbi.dll' DiskId='1' src='nssckbi.dll' Vital='yes' />
+ <File Id='NSSROOTCERTS' DiskId='1' Source='nssckbi.dll' Vital='yes' />
</Component>
<Component Id='NSScertutil' Guid='7741A56D-3E96-4823-AC0F-0B81A696651F' Win64='$(var.Property_Win64)'>
- <File Id='NSSCERTUTIL' LongName='certutil.exe' Name='certutil.exe' DiskId='1' src='certutil.exe' Vital='yes' />
+ <File Id='NSSCERTUTIL' DiskId='1' Source='certutil.exe' Vital='yes' />
</Component>
<Component Id='NSSpk12util' Guid='F10ABF8A-8C10-49f6-8150-45616EA4C360' Win64='$(var.Property_Win64)'>
- <File Id='NSSPK12UTIL' LongName='pk12util.exe' Name='pk12util.exe' DiskId='1' src='pk12util.exe' Vital='yes' />
+ <File Id='NSSPK12UTIL' DiskId='1' Source='pk12util.exe' Vital='yes' />
</Component>
<Component Id='JSSLibrary' Guid='844240DD-3EE8-444e-BA48-5C114648096B' Win64='$(var.Property_Win64)'>
- <File Id='JSSLIB' LongName='jss4.dll' Name='jss4.dll' DiskId='1' src='jss4.dll' Vital='yes' />
+ <File Id='JSSLIB' DiskId='1' Source='jss4.dll' Vital='yes' />
</Component>
<Component Id='JSSJar' Guid='064A960B-4D7E-45cc-895B-19DE1D9AEF77' Win64='$(var.Property_Win64)'>
- <File Id='JSSJAR' LongName='jss4.jar' Name='jss4.jar' DiskId='1' src='jss4.jar' Vital='yes' />
+ <File Id='JSSJAR' DiskId='1' Source='jss4.jar' Vital='yes' />
</Component>
<Component Id='LDAPJar' Guid='E6D5B3AE-11F5-427f-85D3-D7A6A6A0A55D' Win64='$(var.Property_Win64)'>
- <File Id='LDAPJAR' LongName='ldapjdk.jar' Name='ldapjdk.jar' DiskId='1' src='ldapjdk.jar' Vital='yes' />
+ <File Id='LDAPJAR' DiskId='1' Source='ldapjdk.jar' Vital='yes' />
</Component>
<Component Id='IDMBaseJar' Guid='F45C344F-A3C2-4ffd-9CC6-22D36AA5E69E' Win64='$(var.Property_Win64)'>
- <File Id='IDMBASEJAR' LongName='idm-console-base.jar' Name='idmbase.jar' DiskId='1' src='idm-console-base.jar' Vital='yes' />
+ <File Id='IDMBASEJAR' DiskId='1' Source='idm-console-base.jar' Vital='yes' />
</Component>
<Component Id='IDMMCCJar' Guid='1DB26BB6-56AF-4e7e-BD55-8F1364B7A55B' Win64='$(var.Property_Win64)'>
- <File Id='IDMMCCJAR' LongName='idm-console-mcc.jar' Name='idmmcc.jar' DiskId='1' src='idm-console-mcc.jar' Vital='yes' />
+ <File Id='IDMMCCJAR' DiskId='1' Source='idm-console-mcc.jar' Vital='yes' />
</Component>
<Component Id='IDMMCCENJar' Guid='71FF3A08-C895-4648-A8CC-08F0CD2AD4D6' Win64='$(var.Property_Win64)'>
- <File Id='IDMMCCENJAR' LongName='idm-console-mcc_en.jar' Name='idmmccen.jar' DiskId='1' src='idm-console-mcc_en.jar' Vital='yes' />
+ <File Id='IDMMCCENJAR' DiskId='1' Source='idm-console-mcc_en.jar' Vital='yes' />
</Component>
<Component Id='IDMNMCLFJar' Guid='2F118B1B-3413-4740-A99A-1B22E79AB232' Win64='$(var.Property_Win64)'>
- <File Id='IDMNMCLFJAR' LongName='idm-console-nmclf.jar' Name='idmnmclf.jar' DiskId='1' src='idm-console-nmclf.jar' Vital='yes' />
+ <File Id='IDMNMCLFJAR' DiskId='1' Source='idm-console-nmclf.jar' Vital='yes' />
</Component>
<Component Id='IDMNMCLFENJar' Guid='EB4F2170-BFDC-4c5f-8A12-9812CAADB740' Win64='$(var.Property_Win64)'>
- <File Id='IDMNMCLFENJAR' LongName='idm-console-nmclf_en.jar' Name='idmnmcen.jar' DiskId='1' src='idm-console-nmclf_en.jar' Vital='yes' />
+ <File Id='IDMNMCLFENJAR' DiskId='1' Source='idm-console-nmclf_en.jar' Vital='yes' />
</Component>
<Component Id='ConsoleJar' Guid='BE426443-1A07-406e-97FA-103D518BE233' Win64='$(var.Property_Win64)'>
- <File Id='CONSOLEJAR' LongName='$(var.FILEPREF)-console_en.jar' Name='conen.jar' DiskId='1' src='$(var.FILEPREF)-console_en.jar' Vital='yes' />
+ <File Id='CONSOLEJAR' DiskId='1' Source='$(var.FILEPREF)-console_en.jar' Vital='yes' />
</Component>
<Component Id='ConsoleBat' Guid='00DEC033-5D77-49a2-9478-FA67E8D4EFEA' Win64='$(var.Property_Win64)'>
- <File Id='CONSOLEBAT' LongName='$(var.FILEPREF)-console.bat' Name='con.bat' DiskId='1' src='$(var.FILEPREF)-console.bat' Vital='yes' >
- <Shortcut Id="startmenuConsole" Directory="ProgramMenuDir" Name="CONFLDR"
- LongName="$(var.SHORTCUT)" WorkingDirectory='INSTALLDIR' Show="minimized"
+ <File Id='CONSOLEBAT' DiskId='1' Source='$(var.FILEPREF)-console.bat' KeyPath='yes' Vital='yes' >
+ <Shortcut Id="startmenuConsole" Directory="ProgramMenuDir"
+ Name="$(var.SHORTCUT)" WorkingDirectory='INSTALLDIR' Show="minimized"
Icon="Logo$(var.BRANDNOSPACE).ico" IconIndex="0" Advertise="yes" />
- <Shortcut Id="desktopConsole" Directory="DesktopFolder" Name="CONFLDR"
- LongName="$(var.SHORTCUT)" WorkingDirectory='INSTALLDIR' Show="minimized"
+ <Shortcut Id="desktopConsole" Directory="DesktopFolder"
+ Name="$(var.SHORTCUT)" WorkingDirectory='INSTALLDIR' Show="minimized"
Icon="Logo$(var.BRANDNOSPACE).ico" IconIndex="0" Advertise="yes" />
</File>
</Component>
<Component Id='License.rtf' Guid='D40977B8-BB2B-4796-B855-3503AF5FF881' Win64='$(var.Property_Win64)'>
- <File Id='LICENSERTF' LongName='License.rtf' Name='License.rtf' DiskId='1' src='License.rtf' Vital='yes' />
+ <File Id='LICENSERTF' DiskId='1' Source='License.rtf' Vital='yes' />
</Component>
</Directory>
</Directory>
- <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
- <Directory Id="ProgramMenuDir" Name='CONFLDR' LongName="$(var.PRODUCTNAME)" />
+ <Directory Id="ProgramMenuFolder" >
+ <Directory Id="ProgramMenuDir" Name="$(var.PRODUCTNAME)" >
+ <Component Id="ProgramMenuDir" Guid="AFC28CAB-E2A7-4826-9907-CA8EE6957E87" >
+ <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
+ <RegistryValue Root='HKCU' Key='Software\$(var.VENDOR)\$(var.PRODUCTNAME)' Type='string' Value='' KeyPath='yes' />
+ </Component>
+ </Directory>
+ <Directory Id="DesktopFolder" Name="Desktop" />
</Directory>
-
- <Directory Id="DesktopFolder" Name="Desktop" />
-
</Directory>
<Feature Id='Complete' Title='$(var.PRODUCTNAME)' Description='The complete package.' Display='expand'
@@ -291,11 +298,14 @@
<ComponentRef Id='ConsoleJar' />
<ComponentRef Id='ConsoleBat' />
<ComponentRef Id='License.rtf' />
+ <ComponentRef Id='ProgramMenuDir' />
</Feature>
+<?if $(var.CRTMSM) AND ($(var.CRTMSM) != $(var.EMPTY)) ?>
<Feature Id='CRT_WinSXS' Title='CRT WinSXS' AllowAdvertise="no" Display="hidden" Level='1'>
- <MergeRef Id='CRT' />
+ <MergeRef Id='CRT' />
<MergeRef Id='PolicyCRT' />
</Feature>
+<?endif ?>
</Feature>
<Property Id="INSTALLLEVEL">3</Property>
@@ -310,6 +320,9 @@
<Custom Action='RemoveOldShortcuts' After='RemoveOldPkg'>OLDSHORTCUT AND OLDPROGRAMFOLDER AND NOT Installed</Custom>
</InstallExecuteSequence>
+ <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
+ <WixVariable Id="WixUIBannerBmp" Value="Bitmaps\BannrBmp.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="Bitmaps\DlgBmp.bmp" />
<Icon Id="Logo$(var.BRANDNOSPACE).ico" SourceFile="Logo$(var.BRANDNOSPACE).ico" />
</Product>
diff --git a/win/Makefile b/win/Makefile
index ebe40ba..b0e9083 100644
--- a/win/Makefile
+++ b/win/Makefile
@@ -45,7 +45,6 @@
PKGDIR=.
WXSDIR=.
-
!IF "$(CPU)" == "AMD64"
FLAG64=_64
USE64=1
@@ -86,22 +85,25 @@ SBC=http://filer/components
SBV=http://filer/components
!ENDIF
+MOZILLABUILDDIR=c:\mozilla-build
+
#UZCMD=cscript //nologo unzip.vbs
-UZCMD=c:\mozilla-build\info-zip\unzip.exe -q -o
+UZCMD=$(MOZILLABUILDDIR)\info-zip\unzip.exe -q -o
NSPRVER=4.8.4
NSSVER=3_12_6
LDAPJDKVER=4.18
-LDAPJDKVERDIR=4.18/20070817.1
+LDAPJDKVERDIR=v$(LDAPJDKVER)
JSSVER=4_2_6
!IFDEF USE64
JSSVERDIR=JSS_$(JSSVER)_RTM/20091019.1
!ELSE
JSSVERDIR=JSS_$(JSSVER)_RTM/20091020.1
!ENDIF
-IDMVER=1.1.5
-IDMVERDIR=$(IDMVER)/20100503.1
-WIXVER=2.0.5805.0
+IDMVER=1.1.7
+IDMVERDIR=$(IDMVER)/20110621.1
+WIXVER=351728
+#WIXVER=2.0.5805.0
# where to stage the package layout
PKGDIR=build.$(PLAT)
@@ -125,14 +127,21 @@ LDAPDIR=$(COMPDIR)\console
IDMDIR=$(COMPDIR)\console
# where to find the console jar and other files
CONSOLEDIR=$(COMPDIR)\console
-CONSOLEJARURL=$(SBV)/$(FILEPREF)-console/1.0/20090122.1
+CONSOLEJARURL=$(SBV)/$(FILEPREF)-console/9.0/20110621.1
WIXURL=$(SBC)/wix
-WIXDIR=$(COMPDIR)\wix
+WIXDIR=$(MOZILLABUILDDIR)\wix-$(WIXVER)
+#WIXDIR=$(COMPDIR)\wix
#CANDLE=$(WIXDIR)\candle.exe
-CANDLE=wix\candle.exe
+CANDLE=$(WIXDIR)\candle.exe
LIGHT=$(WIXDIR)\light.exe
+!IFDEF NOMSM
+MSMOPTS="-dCRTMSM=" "-dPOLICYCRTMSM="
+!ELSE
+MSMOPTS="-dCRTMSM=$(CRTMSM)" "-dPOLICYCRTMSM=$(POLICYCRTMSM)"
+!ENDIF
+
ALL : $(PKGDIR)\$(FULL_PKGNAME)
$(PKGDIR) :
@@ -161,7 +170,7 @@ $(JSSDIR)\jss4.jar :
if not exist $@ $(DOWNLOAD) $(SBV)/jss/$(JSSVERDIR)/$(@F) %%CD%%\$@
$(LDAPDIR)\ldapjdk.jar : $(LDAPDIR)
- if not exist $@ $(DOWNLOAD) $(SBV)/ldapjdk/$(LDAPJDKVERDIR)/$(@F) %%CD%%\$@
+ if not exist $@ $(DOWNLOAD) $(SBC)/ldapjdk41/$(LDAPJDKVERDIR)/$(@F) %%CD%%\$@
$(IDMDIR)\idm-console-base.jar $(IDMDIR)\idm-console-mcc.jar $(IDMDIR)\idm-console-mcc_en.jar $(IDMDIR)\idm-console-nmclf.jar $(IDMDIR)\idm-console-nmclf_en.jar : $(IDMDIR)
if not exist $@ $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/$(@F) %%CD%%\$@
@@ -169,11 +178,11 @@ $(IDMDIR)\idm-console-base.jar $(IDMDIR)\idm-console-mcc.jar $(IDMDIR)\idm-conso
$(CONSOLEDIR)\$(FILEPREF)-console_en.jar : $(CONSOLEDIR)
if not exist $@ $(DOWNLOAD) $(CONSOLEJARURL)/$(@F) %%CD%%\$@
-$(WIXDIR)\wix-$(WIXVER).zip : $(WIXDIR)
- if not exist $@ $(DOWNLOAD) $(WIXURL)/$(@F) %%CD%%\$@
+#$(WIXDIR)\wix-$(WIXVER).zip : $(WIXDIR)
+# if not exist $@ $(DOWNLOAD) $(WIXURL)/$(@F) %%CD%%\$@
-$(PKGDIR)\$(CANDLE) : $(WIXDIR)\wix-$(WIXVER).zip
- $(UZCMD) $? -d $(?D)
+#$(PKGDIR)\$(CANDLE) : $(WIXDIR)\wix-$(WIXVER).zip
+# $(UZCMD) $? -d $(?D)
LAYOUT : $(PKGDIR) $(NSPRLIBDIR)\libnspr4.dll $(NSSLIBDIR)\nss3.dll $(JSSDIR)\jss4.dll $(JSSDIR)\jss4.jar $(LDAPDIR)\ldapjdk.jar $(IDMDIR)\idm-console-base.jar $(IDMDIR)\idm-console-mcc.jar $(IDMDIR)\idm-console-mcc_en.jar $(IDMDIR)\idm-console-nmclf.jar $(IDMDIR)\idm-console-nmclf_en.jar $(CONSOLEDIR)\$(FILEPREF)-console_en.jar
copy /Y $(NSPRLIBDIR)\*.dll $(PKGDIR)
@@ -193,9 +202,9 @@ LAYOUT : $(PKGDIR) $(NSPRLIBDIR)\libnspr4.dll $(NSSLIBDIR)\nss3.dll $(JSSDIR)\js
copy /Y $(BITMAPDIR)\* $(PKGDIR)\Bitmaps\*
copy /Y License.rtf $(PKGDIR)
-$(PKGDIR)\$(FULL_PKGNAME) : $(PKGDIR) LAYOUT $(PKGDIR)\$(CANDLE) $(PKGNAME).wxs
- cd $(PKGDIR) & cd & $(CANDLE) -nologo "-dCRTMSM=$(CRTMSM)" "-dPOLICYCRTMSM=$(POLICYCRTMSM)" -dVERSION=$(VERSION) -dUSE64=$(USE64) "-dBRAND=$(BRAND)" -dBRANDNOSPACE=$(BRANDNOSPACE) "-dVENDOR=$(VENDOR)" -dPKGGUID=$(PKGGUID) "-dPRODUCTNAME=$(PRODUCTNAME)" -dFILEPREF=$(FILEPREF) -dUPGRADEGUID=$(UPGRADEGUID) -dOLDGUID=$(OLDGUID) "-dSHORTCUT=$(SHORTCUT)" "-dOLDSHORTCUT=$(OLDSHORTCUT)" "-dOLDPROGRAMFOLDER=$(OLDPROGRAMFOLDER)" -out $(PKGNAME).wixobj ..\$(PKGNAME).wxs
- $(LIGHT) -nologo -out $@ -b $(PKGDIR) $(PKGDIR)\$(PKGNAME).wixobj $(WIXDIR)\wixui.wixlib -loc $(WIXDIR)\WixUI_en-us.wxl
+$(PKGDIR)\$(FULL_PKGNAME) : $(PKGDIR) LAYOUT $(CANDLE) $(PKGNAME).wxs
+ cd $(PKGDIR) & cd & $(CANDLE) -nologo $(MSMOPTS) -dVERSION=$(VERSION) -dUSE64=$(USE64) "-dBRAND=$(BRAND)" -dBRANDNOSPACE=$(BRANDNOSPACE) "-dVENDOR=$(VENDOR)" -dPKGGUID=$(PKGGUID) "-dPRODUCTNAME=$(PRODUCTNAME)" -dFILEPREF=$(FILEPREF) -dUPGRADEGUID=$(UPGRADEGUID) -dOLDGUID=$(OLDGUID) "-dSHORTCUT=$(SHORTCUT)" "-dOLDSHORTCUT=$(OLDSHORTCUT)" "-dOLDPROGRAMFOLDER=$(OLDPROGRAMFOLDER)" -out $(PKGNAME).wixobj ..\$(PKGNAME).wxs
+ $(LIGHT) -nologo -out $@ -b $(PKGDIR) $(PKGDIR)\$(PKGNAME).wixobj -ext WixUIExtension -cultures:en-us
clean:
rmdir /S /Q $(PKGDIR)
diff --git a/win/VERSION.mak b/win/VERSION.mak
index 6ca3bc6..8bbc1df 100644
--- a/win/VERSION.mak
+++ b/win/VERSION.mak
@@ -7,14 +7,14 @@ BRANDNOSPACE=389
# this is the vendor or manufacturer
VENDOR=389 Project
# the version
-VERSION=1.1.6
+VERSION=1.1.7
# the name of the product - this is used in the title of the
# installer, in the name of the folder, and in the name
# of the shortcuts
PRODUCTNAME=$(BRAND) Management Console
# this is the GUID of the package - must be changed
# when the version is changed - use uuidgen -n1
-PKGGUID=FD65E7CA-6D18-419a-9296-0224F81229EC
+PKGGUID=3D26B463-9543-49F3-954E-C9AA3A76EC3A
# the upgrade GUID should usually not be changed
UPGRADEGUID=7EA828C0-C219-438d-9BB3-3418DC900D60
# guid of old version to be removed
diff --git a/win/build.bat b/win/build.bat
index 7d99ff3..ae425b1 100644
--- a/win/build.bat
+++ b/win/build.bat
@@ -64,11 +64,18 @@ if not defined CRTMSM (
)
if not defined CRTMSM (
- echo ERROR: could not find the merge modules for the Visual C++
- echo runtime side by side assemblies - they should be provided
- echo with the Visual Studio C++ and/or the Windows SDK
- echo cannot continue
- exit 1
+ if not defined NOMSM (
+ echo ERROR: could not find the merge modules for the Visual C++
+ echo runtime side by side assemblies - they should be provided
+ echo with the Visual Studio C++ and/or the Windows SDK
+ echo cannot continue
+ exit 1
+ )
+ echo WARNING: no Visual C++ merge modules found
+ echo Package will be built without merge modules
+ echo In order to run the package, you will have
+ echo to go to the microsoft web site, download the
+ echo Visual C++ Redistributable Package, and install it
)
-nmake /nologo CRTMSM=%CRTMSM% POLICYCRTMSM=%POLICYCRTMSM%
+nmake /nologo NOMSM=%NOMSM% CRTMSM=%CRTMSM% POLICYCRTMSM=%POLICYCRTMSM%
More information about the Pkg-fedora-ds-maintainers
mailing list