build.properties | 2 +-
win/Console.wxs | 6 +++---
win/Makefile | 6 +++---
win/VERSION.mak | 6 +++---
win/build.bat | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 29bc6470563ebdd306abc14f53a28f21b3c9eb14
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Jul 10 14:05:10 2015 -0700
version 1.1.11
- change the nspr library name for windows (win/{Console.wxs,Makefile}).
libnspr4.dll -> nspr4.dll
libplds4.dll -> plds4.dll
libplc4.dll -> plc4.dll
- Removed unused NOMSM from win/build.bat.
diff --git a/build.properties b/build.properties
index 4b6529d..a8f5ed0 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
console.root=.
console.version=11
-console.dotversion=1.1.10
+console.dotversion=1.1.11
console.dotgenversion=1.1
theme.core=389-console
diff --git a/win/Console.wxs b/win/Console.wxs
index 6ceb669..885d35b 100644
--- a/win/Console.wxs
+++ b/win/Console.wxs
@@ -148,15 +148,15 @@
<Directory Id='INSTALLDIR' Name='$(var.PRODUCTNAME)'>
<Component Id='NSPRLibrary'
Guid='DE133754-3C99-49e7-8A71-0375AB348CDD'
Win64='$(var.Property_Win64)'>
- <File Id='NSPR' DiskId='1' Source='libnspr4.dll'
Vital='yes' />
+ <File Id='NSPR' DiskId='1' Source='nspr4.dll'
Vital='yes' />
</Component>
<Component Id='NSPRpldsLibrary'
Guid='7DCDBD30-DC5B-4c89-BD94-EE55E1D9D082'
Win64='$(var.Property_Win64)'>
- <File Id='NSPRPLDS' DiskId='1'
Source='libplds4.dll' Vital='yes' />
+ <File Id='NSPRPLDS' DiskId='1' Source='plds4.dll'
Vital='yes' />
</Component>
<Component Id='NSPRplcLibrary'
Guid='4E707871-BA8E-41e2-982E-E3E79E85A599'
Win64='$(var.Property_Win64)'>
- <File Id='NSPRPLC' DiskId='1' Source='libplc4.dll'
Vital='yes' />
+ <File Id='NSPRPLC' DiskId='1' Source='plc4.dll'
Vital='yes' />
</Component>
<Component Id='NSSLibrary'
Guid='3196F339-901E-42c4-AAD3-704775DCF5F4'
Win64='$(var.Property_Win64)'>
diff --git a/win/Makefile b/win/Makefile
index d6e6379..dd994b7 100644
--- a/win/Makefile
+++ b/win/Makefile
@@ -154,7 +154,7 @@ $(NSPRDIR) $(NSSDIR) $(JSSDIR) $(LDAPDIR) $(IDMDIR) $(CONSOLEDIR)
$(WIXDIR):
$(NSPRDIR)\mdbinary.jar : $(NSPRDIR)
if not exist $@ $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/$(@F) %%CD%%\$@
-$(NSPRLIBDIR)\libnspr4.dll : $(NSPRDIR)\mdbinary.jar
+$(NSPRLIBDIR)\nspr4.dll : $(NSPRDIR)\mdbinary.jar
$(UZCMD) $? -d $(?D)
$(NSSDIR)\mdbinary.jar : $(NSSDIR)
@@ -184,7 +184,7 @@ $(CONSOLEDIR)\$(FILEPREF)-console_en.jar : $(CONSOLEDIR)
#$(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
+LAYOUT : $(PKGDIR) $(NSPRLIBDIR)\nspr4.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)
copy /Y $(NSSLIBDIR)\*.dll $(PKGDIR)
copy /Y $(NSSBINDIR)\certutil.exe $(PKGDIR)
diff --git a/win/VERSION.mak b/win/VERSION.mak
index ab14364..c97e041 100644
--- a/win/VERSION.mak
+++ b/win/VERSION.mak
@@ -7,7 +7,7 @@ BRANDNOSPACE=389
# this is the vendor or manufacturer
VENDOR=389 Project
# the version
-VERSION=1.1.10
+VERSION=1.1.11
# 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
diff --git a/win/build.bat b/win/build.bat
index ae425b1..d48ed7d 100644
--- a/win/build.bat
+++ b/win/build.bat
@@ -64,7 +64,7 @@ if not defined CRTMSM (
)
if not defined CRTMSM (
- if not defined NOMSM (
+ if not defined POLICYCRTMSM (
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
@@ -78,4 +78,4 @@ if not defined CRTMSM (
echo Visual C++ Redistributable Package, and install it
)
-nmake /nologo NOMSM=%NOMSM% CRTMSM=%CRTMSM% POLICYCRTMSM=%POLICYCRTMSM%
+nmake /nologo CRTMSM=%CRTMSM% POLICYCRTMSM=%POLICYCRTMSM%
commit 43e3ebcdce1f679b1e98ad881c7da0a98b6c1df2
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Jun 24 12:59:25 2015 -0700
version 1.1.10
diff --git a/build.properties b/build.properties
index a2ed0c1..4b6529d 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
console.root=.
console.version=11
-console.dotversion=1.1.9
+console.dotversion=1.1.10
console.dotgenversion=1.1
theme.core=389-console
diff --git a/win/Makefile b/win/Makefile
index b0e9083..d6e6379 100644
--- a/win/Makefile
+++ b/win/Makefile
@@ -58,7 +58,7 @@ MSMPLAT=x86
!IF "$(APPVER)" == "6.0"
WINVER=8.0
!ELSE
-WINVER=5.2
+WINVER=6.1
!ENDIF
!IF "$(BUILD_DEBUG)" == "optimize"
diff --git a/win/VERSION.mak b/win/VERSION.mak
index 8bbc1df..ab14364 100644
--- a/win/VERSION.mak
+++ b/win/VERSION.mak
@@ -7,18 +7,18 @@ BRANDNOSPACE=389
# this is the vendor or manufacturer
VENDOR=389 Project
# the version
-VERSION=1.1.7
+VERSION=1.1.10
# 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=3D26B463-9543-49F3-954E-C9AA3A76EC3A
+PKGGUID=595875D5-C97E-442B-8C8C-66DD2A4583B4
# the upgrade GUID should usually not be changed
UPGRADEGUID=7EA828C0-C219-438d-9BB3-3418DC900D60
# guid of old version to be removed
-OLDGUID=36C8F6DB-6C1B-416e-83E4-31A0688EBD3F
+OLDGUID=3D26B463-9543-49F3-954E-C9AA3A76EC3A
OLDSHORTCUT=Fedora IDM Console.lnk
OLDPROGRAMFOLDER=Fedora Identity Management Console
# filename prefix for certain branded jar and script files
Show replies by date