[Fedora-directory-commits] ldapserver/ldap/servers/slapd saslbind.c, 1.13, 1.14
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22242/ldap/servers/slapd
Modified Files:
saslbind.c
Log Message:
[172824] Link SASL library dynamically
i1) For non-RHEL platforms, package cyrus sasl library and the supported plugins.
2) by default, cyrus sasl expects to see the plugins in /usr/lib/sasl2.
Instead, tell sasl to search "../../../lib/sasl2" (relative path from ns-slapd)
for the plugins.
Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- saslbind.c 8 Nov 2005 15:58:22 -0000 1.13
+++ saslbind.c 10 Nov 2005 22:37:54 -0000 1.14
@@ -551,7 +551,18 @@
return returnvalue;
}
-static sasl_callback_t ids_sasl_callbacks[5] =
+#ifdef CYRUS_SASL
+#if !defined(LINUX)
+static int ids_sasl_getpluginpath(sasl_conn_t *conn, const char **path)
+{
+ static char *pluginpath = "../../../lib/sasl2";
+ *path = pluginpath;
+ return SASL_OK;
+}
+#endif
+#endif
+
+static sasl_callback_t ids_sasl_callbacks[] =
{
{
SASL_CB_GETOPT,
@@ -577,6 +588,19 @@
(IFP) ids_sasl_canon_user,
NULL
},
+#ifdef CYRUS_SASL
+ /* On Linux: we use system sasl and plugins are found in the default path
+ * /usr/lib/sasl2
+ * On other platforms: we need to tell cyrus sasl where they are localted.
+ */
+#if !defined(LINUX)
+ {
+ SASL_CB_GETPATH,
+ (IFP) ids_sasl_getpluginpath,
+ NULL
+ },
+#endif
+#endif
{
SASL_CB_LIST_END,
(IFP) NULL,
18 years, 5 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.41,1.42
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22242/ldap/cm
Modified Files:
Makefile
Log Message:
[172824] Link SASL library dynamically
i1) For non-RHEL platforms, package cyrus sasl library and the supported plugins.
2) by default, cyrus sasl expects to see the plugins in /usr/lib/sasl2.
Instead, tell sasl to search "../../../lib/sasl2" (relative path from ns-slapd)
for the plugins.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Makefile 10 Nov 2005 01:35:50 -0000 1.41
+++ Makefile 10 Nov 2005 22:37:49 -0000 1.42
@@ -423,6 +423,14 @@
endif
endif
+# if not Linux, we need package sasl library and supported plugins
+ifneq ($(ARCH), Linux)
+ $(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)* $(RELDIR)/lib
+ -mkdir $(RELDIR)/lib/sasl2
+ $(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libdigestmd5.$(DLL_SUFFIX)* $(RELDIR)/lib/sasl2
+ $(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libgssapiv2.$(DLL_SUFFIX)* $(RELDIR)/lib/sasl2
+endif
+
# the plugin API
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/slapi-plugin.h $(RELDIR)/plugins/slapd/slapi/include
$(INSTALL) -m 644 $(NSPR_INCDIR)/*.h $(RELDIR)/plugins/slapd/slapi/include
18 years, 5 months
- 1
- 0
[Fedora-directory-commits] winsync/usersync/netman netman.dep, NONE, 1.1 netman.mak, NONE, 1.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/netman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14742/usersync/netman
Added Files:
netman.dep netman.mak
Log Message:
Initial checkin of stand-alone winsync build-system
--- NEW FILE netman.dep ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# Microsoft Developer Studio Generated Dependency File, included by netman.mak
.\netman.cpp : \
".\netman.h"\
--- NEW FILE netman.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# nmake Makefile for jnetman.dll and jnetman.jar
#
!IF "$(CFG)" == ""
CFG=netman - Win32 Debug
!MESSAGE No configuration specified. Defaulting to netman - Win32 Debug.
!ENDIF
!IF "$(CFG)" != "netman - Win32 Release" && "$(CFG)" != "netman - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "netman.mak" CFG="netman - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "netman - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "netman - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
!IF "$(CFG)" == "netman - Win32 Release"
OUTDIR=$(OBJDEST)\netman
INTDIR=$(OBJDEST)\netman
# Begin Custom Macros
OutDir=$(OBJDEST)\netman
# End Custom Macros
ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
CLEAN :
-@erase "$(INTDIR)\jnetman_wrap.cxx "
-@erase "$(INTDIR)\jnetman.dll"
-@erase "$(INTDIR)\jnetman.lib"
-@erase "$(INTDIR)\*.obj"
-@erase "$(INTDIR)\*.java"
-@erase "$(INTDIR)\jnetman.jar"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
BSC32_SBRS= \
SWIG=swig.exe
SWIG_OPTS=-v -outdir "$(OUTDIR)"
LINK32=link.exe
LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /out:"$(OUTDIR)\jnetman.dll"
LINK32_OBJS= \
"$(INTDIR)\netman.obj" \
"$(INTDIR)\jnetman_wrap.obj"
"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
$(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
move jnetman_wrap.cxx $(OUTDIR)
"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
$(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
!ELSEIF "$(CFG)" == "netman - Win32 Debug"
OUTDIR=$(OBJDEST)\netman
INTDIR=$(OBJDEST)\netman
# Begin Custom Macros
OutDir=$(OBJDEST)\netman
# End Custom Macros
ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
CLEAN :
-@erase "$(INTDIR)\jnetman_wrap.cxx "
-@erase "$(INTDIR)\jnetman.dll"
-@erase "$(INTDIR)\jnetman.lib"
-@erase "$(INTDIR)\*.obj"
-@erase "$(INTDIR)\*.java"
-@erase "$(INTDIR)\jnetman.jar"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
BSC32_SBRS= \
SWIG=swig.exe
SWIG_OPTS=-v -outdir "$(OUTDIR)"
LINK32=link.exe
LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /debug /out:"$(OUTDIR)\jnetman.dll"
LINK32_OBJS= \
"$(INTDIR)\netman.obj" \
"$(INTDIR)\jnetman_wrap.obj"
"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
$(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
move jnetman_wrap.cxx "$(OUTDIR)"
"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
$(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
!ENDIF
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("netman.dep")
!INCLUDE "netman.dep"
!ELSE
!MESSAGE Warning: cannot find "netman.dep"
!ENDIF
!ENDIF
!IF "$(CFG)" == "netman - Win32 Release" || "$(CFG)" == "netman - Win32 Debug"
SOURCE=.\netman.cpp
"$(INTDIR)\netman.obj" : $(SOURCE) "$(INTDIR)"
SOURCE="$(OUTDIR)\jnetman_wrap.cxx"
"$(INTDIR)\jnetman_wrap.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. $(SOURCE)
$(OUTDIR)\jnetman.jar : $(SOURCE) "$(OUTDIR)"
javac -d $(OUTDIR) $(OUTDIR)\*.java
(cd $(OUTDIR) && jar cf $(OUTDIR)\jnetman.jar org)
!ENDIF
18 years, 5 months
- 1
- 0
[Fedora-directory-commits] winsync/usersync/apacheds apacheds.mak, NONE, 1.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/apacheds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14742/usersync/apacheds
Added Files:
apacheds.mak
Log Message:
Initial checkin of stand-alone winsync build-system
--- NEW FILE apacheds.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# nmake Makefile for usersync.jar
#
OUTDIR=$(OBJDEST)\apacheds
USERSYNCJAR=$(OUTDIR)\usersync.jar
CLASSPATH=$(APACHEDS_FILE);$(OBJDEST)\netman\jnetman.jar
ALL : "$(USERSYNCJAR)"
$(APACHEDSSOURCE)\core\target : "$(OBJDEST)\netman\jnetman.jar" "$(OUTDIR)"
copy project.properties "$(APACHEDSSOURCE)\core"
copy usersync.schema "$(APACHEDSSOURCE)\core\src\main\schema"
maven -b -d "$(APACHEDSSOURCE)\core" -e directory:schema
javac -classpath "$(CLASSPATH)" $(APACHEDSSOURCE)\core\target\schema\org\apache\ldap\server\schema\bootstrap\*.java
javac -classpath "$(CLASSPATH)" -d "$(APACHEDSSOURCE)\core\target\schema" org\apache\ldap\server\*.java
$(USERSYNCJAR) : "$(APACHEDSSOURCE)\core\target"
( cd "$(APACHEDSSOURCE)\core\target\schema" && jar cf usersync.jar org)
move "$(APACHEDSSOURCE)\core\target\schema\usersync.jar" "$(USERSYNCJAR)"
$(OUTDIR) :
if not exist "$(OUTDIR)" mkdir "$(OUTDIR)"
18 years, 5 months
- 1
- 0
[Fedora-directory-commits] winsync/usersync build.bat, NONE, 1.1 package.mak, NONE, 1.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync/usersync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14742/usersync
Added Files:
build.bat package.mak
Log Message:
Initial checkin of stand-alone winsync build-system
--- NEW FILE build.bat ---
@rem //
@rem // BEGIN COPYRIGHT BLOCK
@rem // This Program is free software; you can redistribute it and/or modify it under
@rem // the terms of the GNU General Public License as published by the Free Software
@rem // Foundation; version 2 of the License.
@rem //
@rem // This Program is distributed in the hope that it will be useful, but WITHOUT
@rem // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@rem // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@rem //
@rem // You should have received a copy of the GNU General Public License along with
@rem // this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
@rem // Place, Suite 330, Boston, MA 02111-1307 USA.
@rem //
@rem // In addition, as a special exception, Red Hat, Inc. gives You the additional
@rem // right to link the code of this Program with code not covered under the GNU
@rem // General Public License ("Non-GPL Code") and to distribute linked combinations
@rem // including the two, subject to the limitations in this paragraph. Non-GPL Code
@rem // permitted under this exception must only link to the code of this Program
@rem // through those well defined interfaces identified in the file named EXCEPTION
@rem // found in the source code files (the "Approved Interfaces"). The files of
@rem // Non-GPL Code may instantiate templates or use macros or inline functions from
@rem // the Approved Interfaces without causing the resulting work to be covered by
@rem // the GNU General Public License. Only Red Hat, Inc. may make changes or
@rem // additions to the list of Approved Interfaces. You must obey the GNU General
@rem // Public License in all respects for all of the Program code and other code used
@rem // in conjunction with the Program except the Non-GPL Code covered by this
@rem // exception. If you modify this file, you may extend this exception to your
@rem // version of the file, but you are not obligated to do so. If you do not wish to
@rem // provide this exception without modification, you must delete this exception
@rem // statement from your version and license this file solely under the GPL without
@rem // exception.
@rem //
@rem //
@rem // Copyright (C) 2005 Red Hat, Inc.
@rem // All rights reserved.
@rem // END COPYRIGHT BLOCK
@rem //
@echo off
if [%BUILD_DEBUG%] == [optimize] (
set FLAVOR=WINNT5.0_OPT.OBJ
) else (
set FLAVOR=WINNT5.0_DBG.OBJ
)
rem ======== Set Various Build Directories ========
set OBJDEST=..\built\%FLAVOR%
rem ------ Convert OBJEST to absolute ------
call :relative %OBJDEST% OBJDEST
set LIBROOT=..\components\%FLAVOR%
rem ------ Convert LIBROOT to absolute ------
call :relative %LIBROOT% LIBROOT
mkdir %LIBROOT%
set PKGDIR=%OBJDEST%\package\ntds
mkdir %PKGDIR%
set DISTDIR=..\dist\%FLAVOR%
rem ------ Convert DISTDIR to absolute ------
call :relative %DISTDIR% DISTDIR
mkdir %DISTDIR%
set WXSDIR=%CD%\wix
rem ======== Fetch Components ========
if [%INTERNAL_BUILD%] == [1] (
set COMPONENT_URL=http://ftp-rel.sfbay.redhat.com/share/builds/components
) else (
set COMPONENT_URL=http://directory.fedora.redhat.com/built/components
)
rem ------ ApacheDS ------
set APACHEDS_LOCATION=%COMPONENT_URL%/apacheds/0.9
set APACHEDSSOURCE=%OBJDEST%\apacheds\apacheds-0.9
set APACHEDS_FILE=%LIBROOT%\apacheds\apacheds-main-0.9.jar
if NOT EXIST %LIBROOT%\apacheds (
pushd %CD%
mkdir %LIBROOT%\apacheds
cd %LIBROOT%\apacheds
echo %APACHEDS_LOCATION% > version.txt
wget --no-directories %APACHEDS_LOCATION%/apacheds-0.9-src.zip
unzip -q -d%OBJDEST%\apacheds apacheds-0.9-src.zip
wget --no-directories %APACHEDS_LOCATION%/apacheds-main-0.9.jar
popd
)
rem ------ Wrapper ------
set WRAPPER_LOCATION=%COMPONENT_URL%/wrapper/3.1.2
set WRAPPER_FILES=%LIBROOT%\wrapper\wrapper_win32_3.1.2
if NOT EXIST %LIBROOT%\wrapper (
pushd %CD%
mkdir %LIBROOT%\wrapper
cd %LIBROOT%\wrapper
echo %WRAPPER_LOCATION% > version.txt
wget --no-directories %WRAPPER_LOCATION%/wrapper_win32_3.1.2.zip
unzip -q wrapper_win32_3.1.2.zip
popd
)
set OK=0
pushd %CD%
rem ======== Build ========
rem ------ Netman ------
cd netman
echo -------- Beginning Netman Build --------
nmake /f netman.mak
set /a OK=%OK% + %ERRORLEVEL%
if [%OK%] GTR [1] (
echo -------- Netman Build Failed! --------
goto :END
) else (
echo -------- Netman Build Successful! --------
)
rem ------ ApacheDS ------
cd ..\apacheds
echo -------- Beginning ApacheDS Build --------
nmake /f apacheds.mak
set /a OK=%OK% + %ERRORLEVEL%
if [%OK%] GTR [1] (
echo -------- ApacheDS Build Failed! --------
goto :END
) else (
echo -------- ApacheDS Build Successful! --------
)
rem ======== Package ========
cd ..
echo -------- Beginning Packaging --------
nmake /f package.mak
set /a OK=%OK% + %ERRORLEVEL%
if EXIST %PKGDIR%\ntds.msi (
copy /Y %PKGDIR%\ntds.msi %DISTDIR%
set /a OK=%OK% + %ERRORLEVEL%
)
if [%OK%] GTR [1] (
echo -------- Packaging Failed! --------
goto :END
) else (
echo -------- Packaging Successful! --------
)
:END
popd
if [%OK%] GTR [1] (
echo -------- Build Failed! --------
set OK=1
) else (
echo -------- Build Successful! --------
)
exit %OK%
:relative
rem ======== Converts relative path to absolute path ========
rem ------ %1 is the path, %2 is the variable to be set ------
set %2=%~f1
goto :EOF
--- NEW FILE package.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# Packaging nmake Makefile for ntds.msi
#
ALL : ntds.msi
LAYOUT :
mkdir "$(PKGDIR)\bin"
copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
mkdir "$(PKGDIR)\conf"
copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
mkdir "$(PKGDIR)\lib"
copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
mkdir "$(PKGDIR)\logs"
ntds.msi : LAYOUT
mkdir "$(PKGDIR)\Binary"
copy /Y wix\Binary "$(PKGDIR)\Binary"
cd "$(PKGDIR)"
candle "$(WXSDIR)\ntds.wxs"
light ntds.wixobj
18 years, 5 months
- 1
- 0
[Fedora-directory-commits] winsync/passwordsync package.mak, NONE, 1.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14742/passwordsync
Added Files:
package.mak
Log Message:
Initial checkin of stand-alone winsync build-system
--- NEW FILE package.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# Packaging nmake Makefile for PassSync.msi
ALL : PassSync.msi
LAYOUT :
copy /Y "$(OBJDEST)\passsync\passsync.exe" "$(PKGDIR)"
copy /Y "$(OBJDEST)\passhook\passhook.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldap32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldapssl32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldappr32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libnspr4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libplds4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libplc4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\nss3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\ssl3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\softokn3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\smime3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\bin\certutil.exe" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\bin\pk12util.exe" "$(PKGDIR)"
PassSync.msi : LAYOUT
mkdir "$(PKGDIR)\Binary"
copy /Y wix\Binary "$(PKGDIR)\Binary"
cd "$(PKGDIR)"
candle "$(WXSDIR)\PassSync.wxs"
light PassSync.wixobj
18 years, 5 months
- 1
- 0
[Fedora-directory-commits] winsync winsync.mak,NONE,1.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14742
Added Files:
winsync.mak
Log Message:
Initial checkin of stand-alone winsync build-system
--- NEW FILE winsync.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# nmake Makefile for Windows Sync components
#
ALL : PASSSYNC NTDS
CLEAN_ALL : CLEAN
if exist components rmdir /S/Q components
CLEAN :
if exist built rmdir /S/Q built
if exist dist rmdir /S/Q dist
PASSSYNC :
cd passwordsync
build.bat
cd ..
NTDS :
cd usersync
build.bat
cd ..
18 years, 5 months
- 1
- 0
[Fedora-directory-commits] winsync/usersync/netman netman.dep, 1.1, 1.2 netman.mak, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/netman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/usersync/netman
Modified Files:
netman.dep netman.mak
Log Message:
Remove carriage returns from nmake makefiles
Index: netman.dep
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/netman/netman.dep,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netman.dep 10 Nov 2005 00:05:20 -0000 1.1
+++ netman.dep 10 Nov 2005 04:18:26 -0000 1.2
@@ -1,44 +1,44 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Microsoft Developer Studio Generated Dependency File, included by netman.mak
-
-.\netman.cpp : \
- ".\netman.h"\
-
-
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# Microsoft Developer Studio Generated Dependency File, included by netman.mak
+
+.\netman.cpp : \
+ ".\netman.h"\
+
+
Index: netman.mak
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/netman/netman.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netman.mak 10 Nov 2005 00:37:02 -0000 1.2
+++ netman.mak 10 Nov 2005 04:18:26 -0000 1.3
@@ -1,249 +1,249 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for jnetman.dll and jnetman.jar
-#
-!IF "$(CFG)" == ""
-CFG=netman - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to netman - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "netman - Win32 Release" && "$(CFG)" != "netman - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "netman.mak" CFG="netman - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "netman - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "netman - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-!IF "$(CFG)" == "netman - Win32 Release"
-
-OUTDIR=$(OBJDEST)\netman
-INTDIR=$(OBJDEST)\netman
-# Begin Custom Macros
-OutDir=$(OBJDEST)\netman
-# End Custom Macros
-
-ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
-
-
-CLEAN :
- -@erase "$(INTDIR)\jnetman_wrap.cxx "
- -@erase "$(INTDIR)\jnetman.dll"
- -@erase "$(INTDIR)\jnetman.lib"
- -@erase "$(INTDIR)\*.obj"
- -@erase "$(INTDIR)\*.java"
- -@erase "$(INTDIR)\jnetman.jar"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
-BSC32_SBRS= \
-
-SWIG=swig.exe
-SWIG_OPTS=-v -outdir "$(OUTDIR)"
-
-LINK32=link.exe
-LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
-LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /out:"$(OUTDIR)\jnetman.dll"
-LINK32_OBJS= \
- "$(INTDIR)\netman.obj" \
- "$(INTDIR)\jnetman_wrap.obj"
-
-"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
- $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
- move jnetman_wrap.cxx $(OUTDIR)
-
-"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
- $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
-
-!ELSEIF "$(CFG)" == "netman - Win32 Debug"
-
-OUTDIR=$(OBJDEST)\netman
-INTDIR=$(OBJDEST)\netman
-# Begin Custom Macros
-OutDir=$(OBJDEST)\netman
-# End Custom Macros
-
-ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
-
-
-CLEAN :
- -@erase "$(INTDIR)\jnetman_wrap.cxx "
- -@erase "$(INTDIR)\jnetman.dll"
- -@erase "$(INTDIR)\jnetman.lib"
- -@erase "$(INTDIR)\*.obj"
- -@erase "$(INTDIR)\*.java"
- -@erase "$(INTDIR)\jnetman.jar"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
-BSC32_SBRS= \
-
-SWIG=swig.exe
-SWIG_OPTS=-v -outdir "$(OUTDIR)"
-
-LINK32=link.exe
-LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
-LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /debug /out:"$(OUTDIR)\jnetman.dll"
-LINK32_OBJS= \
- "$(INTDIR)\netman.obj" \
- "$(INTDIR)\jnetman_wrap.obj"
-
-"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
- $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
- move jnetman_wrap.cxx "$(OUTDIR)"
-
-"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
- $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
-
-!ENDIF
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("netman.dep")
-!INCLUDE "netman.dep"
-!ELSE
-!MESSAGE Warning: cannot find "netman.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "netman - Win32 Release" || "$(CFG)" == "netman - Win32 Debug"
-
-SOURCE=.\netman.cpp
-
-"$(INTDIR)\netman.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE="$(OUTDIR)\jnetman_wrap.cxx"
-
-"$(INTDIR)\jnetman_wrap.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. $(SOURCE)
-
-$(OUTDIR)\jnetman.jar : $(SOURCE) "$(OUTDIR)"
- javac -d $(OUTDIR) $(OUTDIR)\*.java
- (cd $(OUTDIR) && jar cf $(OUTDIR)\jnetman.jar org)
-
-!ENDIF
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for jnetman.dll and jnetman.jar
+#
+!IF "$(CFG)" == ""
+CFG=netman - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to netman - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "netman - Win32 Release" && "$(CFG)" != "netman - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "netman.mak" CFG="netman - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "netman - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "netman - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF "$(CFG)" == "netman - Win32 Release"
+
+OUTDIR=$(OBJDEST)\netman
+INTDIR=$(OBJDEST)\netman
+# Begin Custom Macros
+OutDir=$(OBJDEST)\netman
+# End Custom Macros
+
+ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\jnetman_wrap.cxx "
+ -@erase "$(INTDIR)\jnetman.dll"
+ -@erase "$(INTDIR)\jnetman.lib"
+ -@erase "$(INTDIR)\*.obj"
+ -@erase "$(INTDIR)\*.java"
+ -@erase "$(INTDIR)\jnetman.jar"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
+BSC32_SBRS= \
+
+SWIG=swig.exe
+SWIG_OPTS=-v -outdir "$(OUTDIR)"
+
+LINK32=link.exe
+LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
+LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /out:"$(OUTDIR)\jnetman.dll"
+LINK32_OBJS= \
+ "$(INTDIR)\netman.obj" \
+ "$(INTDIR)\jnetman_wrap.obj"
+
+"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
+ $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
+ move jnetman_wrap.cxx $(OUTDIR)
+
+"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
+ $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
+
+!ELSEIF "$(CFG)" == "netman - Win32 Debug"
+
+OUTDIR=$(OBJDEST)\netman
+INTDIR=$(OBJDEST)\netman
+# Begin Custom Macros
+OutDir=$(OBJDEST)\netman
+# End Custom Macros
+
+ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\jnetman_wrap.cxx "
+ -@erase "$(INTDIR)\jnetman.dll"
+ -@erase "$(INTDIR)\jnetman.lib"
+ -@erase "$(INTDIR)\*.obj"
+ -@erase "$(INTDIR)\*.java"
+ -@erase "$(INTDIR)\jnetman.jar"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
+BSC32_SBRS= \
+
+SWIG=swig.exe
+SWIG_OPTS=-v -outdir "$(OUTDIR)"
+
+LINK32=link.exe
+LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
+LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /debug /out:"$(OUTDIR)\jnetman.dll"
+LINK32_OBJS= \
+ "$(INTDIR)\netman.obj" \
+ "$(INTDIR)\jnetman_wrap.obj"
+
+"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
+ $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
+ move jnetman_wrap.cxx "$(OUTDIR)"
+
+"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
+ $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
+
+!ENDIF
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("netman.dep")
+!INCLUDE "netman.dep"
+!ELSE
+!MESSAGE Warning: cannot find "netman.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "netman - Win32 Release" || "$(CFG)" == "netman - Win32 Debug"
+
+SOURCE=.\netman.cpp
+
+"$(INTDIR)\netman.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE="$(OUTDIR)\jnetman_wrap.cxx"
+
+"$(INTDIR)\jnetman_wrap.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. $(SOURCE)
+
+$(OUTDIR)\jnetman.jar : $(SOURCE) "$(OUTDIR)"
+ javac -d $(OUTDIR) $(OUTDIR)\*.java
+ (cd $(OUTDIR) && jar cf $(OUTDIR)\jnetman.jar org)
+
+!ENDIF
18 years, 5 months
- 1
- 0
[Fedora-directory-commits] winsync/usersync/apacheds apacheds.mak, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/apacheds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/usersync/apacheds
Modified Files:
apacheds.mak
Log Message:
Remove carriage returns from nmake makefiles
Index: apacheds.mak
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/apacheds/apacheds.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apacheds.mak 10 Nov 2005 00:36:56 -0000 1.2
+++ apacheds.mak 10 Nov 2005 04:18:20 -0000 1.3
@@ -1,62 +1,62 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for usersync.jar
-#
-
-OUTDIR=$(OBJDEST)\apacheds
-USERSYNCJAR=$(OUTDIR)\usersync.jar
-CLASSPATH=$(APACHEDS_FILE);$(OBJDEST)\netman\jnetman.jar
-
-ALL : "$(USERSYNCJAR)"
-
-
-$(APACHEDSSOURCE)\core\target : "$(OBJDEST)\netman\jnetman.jar" "$(OUTDIR)"
- copy project.properties "$(APACHEDSSOURCE)\core"
- copy usersync.schema "$(APACHEDSSOURCE)\core\src\main\schema"
- maven -b -d "$(APACHEDSSOURCE)\core" -e directory:schema
- javac -classpath "$(CLASSPATH)" $(APACHEDSSOURCE)\core\target\schema\org\apache\ldap\server\schema\bootstrap\*.java
- javac -classpath "$(CLASSPATH)" -d "$(APACHEDSSOURCE)\core\target\schema" org\apache\ldap\server\*.java
-
-$(USERSYNCJAR) : "$(APACHEDSSOURCE)\core\target"
- ( cd "$(APACHEDSSOURCE)\core\target\schema" && jar cf usersync.jar org)
- move "$(APACHEDSSOURCE)\core\target\schema\usersync.jar" "$(USERSYNCJAR)"
-
-$(OUTDIR) :
- if not exist "$(OUTDIR)" mkdir "$(OUTDIR)"
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for usersync.jar
+#
+
+OUTDIR=$(OBJDEST)\apacheds
+USERSYNCJAR=$(OUTDIR)\usersync.jar
+CLASSPATH=$(APACHEDS_FILE);$(OBJDEST)\netman\jnetman.jar
+
+ALL : "$(USERSYNCJAR)"
+
+
+$(APACHEDSSOURCE)\core\target : "$(OBJDEST)\netman\jnetman.jar" "$(OUTDIR)"
+ copy project.properties "$(APACHEDSSOURCE)\core"
+ copy usersync.schema "$(APACHEDSSOURCE)\core\src\main\schema"
+ maven -b -d "$(APACHEDSSOURCE)\core" -e directory:schema
+ javac -classpath "$(CLASSPATH)" $(APACHEDSSOURCE)\core\target\schema\org\apache\ldap\server\schema\bootstrap\*.java
+ javac -classpath "$(CLASSPATH)" -d "$(APACHEDSSOURCE)\core\target\schema" org\apache\ldap\server\*.java
+
+$(USERSYNCJAR) : "$(APACHEDSSOURCE)\core\target"
+ ( cd "$(APACHEDSSOURCE)\core\target\schema" && jar cf usersync.jar org)
+ move "$(APACHEDSSOURCE)\core\target\schema\usersync.jar" "$(USERSYNCJAR)"
+
+$(OUTDIR) :
+ if not exist "$(OUTDIR)" mkdir "$(OUTDIR)"
18 years, 5 months
- 1
- 0
[Fedora-directory-commits] winsync/usersync build.bat, 1.1, 1.2 package.mak, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync/usersync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/usersync
Modified Files:
build.bat package.mak
Log Message:
Remove carriage returns from nmake makefiles
Index: build.bat
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.bat 10 Nov 2005 00:04:42 -0000 1.1
+++ build.bat 10 Nov 2005 04:18:15 -0000 1.2
@@ -1,169 +1,169 @@
-@rem //
-@rem // BEGIN COPYRIGHT BLOCK
-@rem // This Program is free software; you can redistribute it and/or modify it under
-@rem // the terms of the GNU General Public License as published by the Free Software
-@rem // Foundation; version 2 of the License.
-@rem //
-@rem // This Program is distributed in the hope that it will be useful, but WITHOUT
-@rem // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-@rem // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-@rem //
-@rem // You should have received a copy of the GNU General Public License along with
-@rem // this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-@rem // Place, Suite 330, Boston, MA 02111-1307 USA.
-@rem //
-@rem // In addition, as a special exception, Red Hat, Inc. gives You the additional
-@rem // right to link the code of this Program with code not covered under the GNU
-@rem // General Public License ("Non-GPL Code") and to distribute linked combinations
-@rem // including the two, subject to the limitations in this paragraph. Non-GPL Code
-@rem // permitted under this exception must only link to the code of this Program
-@rem // through those well defined interfaces identified in the file named EXCEPTION
-@rem // found in the source code files (the "Approved Interfaces"). The files of
-@rem // Non-GPL Code may instantiate templates or use macros or inline functions from
-@rem // the Approved Interfaces without causing the resulting work to be covered by
-@rem // the GNU General Public License. Only Red Hat, Inc. may make changes or
-@rem // additions to the list of Approved Interfaces. You must obey the GNU General
-@rem // Public License in all respects for all of the Program code and other code used
-@rem // in conjunction with the Program except the Non-GPL Code covered by this
-@rem // exception. If you modify this file, you may extend this exception to your
-@rem // version of the file, but you are not obligated to do so. If you do not wish to
-@rem // provide this exception without modification, you must delete this exception
-@rem // statement from your version and license this file solely under the GPL without
-@rem // exception.
-@rem //
-@rem //
-@rem // Copyright (C) 2005 Red Hat, Inc.
-@rem // All rights reserved.
-@rem // END COPYRIGHT BLOCK
-@rem //
-
-@echo off
-
-if [%BUILD_DEBUG%] == [optimize] (
- set FLAVOR=WINNT5.0_OPT.OBJ
-) else (
- set FLAVOR=WINNT5.0_DBG.OBJ
-)
-
-rem ======== Set Various Build Directories ========
-set OBJDEST=..\built\%FLAVOR%
-rem ------ Convert OBJEST to absolute ------
-call :relative %OBJDEST% OBJDEST
-
-set LIBROOT=..\components\%FLAVOR%
-rem ------ Convert LIBROOT to absolute ------
-call :relative %LIBROOT% LIBROOT
-mkdir %LIBROOT%
-
-set PKGDIR=%OBJDEST%\package\ntds
-mkdir %PKGDIR%
-
-set DISTDIR=..\dist\%FLAVOR%
-rem ------ Convert DISTDIR to absolute ------
-call :relative %DISTDIR% DISTDIR
-mkdir %DISTDIR%
-
-set WXSDIR=%CD%\wix
-
-rem ======== Fetch Components ========
-if [%INTERNAL_BUILD%] == [1] (
- set COMPONENT_URL=http://ftp-rel.sfbay.redhat.com/share/builds/components
-) else (
- set COMPONENT_URL=http://directory.fedora.redhat.com/built/components
-)
-
-rem ------ ApacheDS ------
-set APACHEDS_LOCATION=%COMPONENT_URL%/apacheds/0.9
-set APACHEDSSOURCE=%OBJDEST%\apacheds\apacheds-0.9
-set APACHEDS_FILE=%LIBROOT%\apacheds\apacheds-main-0.9.jar
-if NOT EXIST %LIBROOT%\apacheds (
- pushd %CD%
- mkdir %LIBROOT%\apacheds
- cd %LIBROOT%\apacheds
- echo %APACHEDS_LOCATION% > version.txt
- wget --no-directories %APACHEDS_LOCATION%/apacheds-0.9-src.zip
- unzip -q -d%OBJDEST%\apacheds apacheds-0.9-src.zip
- wget --no-directories %APACHEDS_LOCATION%/apacheds-main-0.9.jar
- popd
-)
-
-rem ------ Wrapper ------
-set WRAPPER_LOCATION=%COMPONENT_URL%/wrapper/3.1.2
-set WRAPPER_FILES=%LIBROOT%\wrapper\wrapper_win32_3.1.2
-if NOT EXIST %LIBROOT%\wrapper (
- pushd %CD%
- mkdir %LIBROOT%\wrapper
- cd %LIBROOT%\wrapper
- echo %WRAPPER_LOCATION% > version.txt
- wget --no-directories %WRAPPER_LOCATION%/wrapper_win32_3.1.2.zip
- unzip -q wrapper_win32_3.1.2.zip
- popd
-)
-
-set OK=0
-
-pushd %CD%
-
-rem ======== Build ========
-rem ------ Netman ------
-cd netman
-echo -------- Beginning Netman Build --------
-
-nmake /f netman.mak
-set /a OK=%OK% + %ERRORLEVEL%
-
-if [%OK%] GTR [1] (
- echo -------- Netman Build Failed! --------
- goto :END
-) else (
- echo -------- Netman Build Successful! --------
-)
-
-rem ------ ApacheDS ------
-cd ..\apacheds
-echo -------- Beginning ApacheDS Build --------
-
-nmake /f apacheds.mak
-set /a OK=%OK% + %ERRORLEVEL%
-
-if [%OK%] GTR [1] (
- echo -------- ApacheDS Build Failed! --------
- goto :END
-) else (
- echo -------- ApacheDS Build Successful! --------
-)
-
-rem ======== Package ========
-cd ..
-echo -------- Beginning Packaging --------
-
-nmake /f package.mak
-set /a OK=%OK% + %ERRORLEVEL%
-
-if EXIST %PKGDIR%\ntds.msi (
- copy /Y %PKGDIR%\ntds.msi %DISTDIR%
- set /a OK=%OK% + %ERRORLEVEL%
-)
-
-if [%OK%] GTR [1] (
- echo -------- Packaging Failed! --------
- goto :END
-) else (
- echo -------- Packaging Successful! --------
-)
-
-:END
-popd
-if [%OK%] GTR [1] (
- echo -------- Build Failed! --------
- set OK=1
-) else (
- echo -------- Build Successful! --------
-)
-exit %OK%
-
-:relative
-rem ======== Converts relative path to absolute path ========
-rem ------ %1 is the path, %2 is the variable to be set ------
-set %2=%~f1
-goto :EOF
+@rem //
+@rem // BEGIN COPYRIGHT BLOCK
+@rem // This Program is free software; you can redistribute it and/or modify it under
+@rem // the terms of the GNU General Public License as published by the Free Software
+@rem // Foundation; version 2 of the License.
+@rem //
+@rem // This Program is distributed in the hope that it will be useful, but WITHOUT
+@rem // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+@rem // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+@rem //
+@rem // You should have received a copy of the GNU General Public License along with
+@rem // this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+@rem // Place, Suite 330, Boston, MA 02111-1307 USA.
+@rem //
+@rem // In addition, as a special exception, Red Hat, Inc. gives You the additional
+@rem // right to link the code of this Program with code not covered under the GNU
+@rem // General Public License ("Non-GPL Code") and to distribute linked combinations
+@rem // including the two, subject to the limitations in this paragraph. Non-GPL Code
+@rem // permitted under this exception must only link to the code of this Program
+@rem // through those well defined interfaces identified in the file named EXCEPTION
+@rem // found in the source code files (the "Approved Interfaces"). The files of
+@rem // Non-GPL Code may instantiate templates or use macros or inline functions from
+@rem // the Approved Interfaces without causing the resulting work to be covered by
+@rem // the GNU General Public License. Only Red Hat, Inc. may make changes or
+@rem // additions to the list of Approved Interfaces. You must obey the GNU General
+@rem // Public License in all respects for all of the Program code and other code used
+@rem // in conjunction with the Program except the Non-GPL Code covered by this
+@rem // exception. If you modify this file, you may extend this exception to your
+@rem // version of the file, but you are not obligated to do so. If you do not wish to
+@rem // provide this exception without modification, you must delete this exception
+@rem // statement from your version and license this file solely under the GPL without
+@rem // exception.
+@rem //
+@rem //
+@rem // Copyright (C) 2005 Red Hat, Inc.
+@rem // All rights reserved.
+@rem // END COPYRIGHT BLOCK
+@rem //
+
+@echo off
+
+if [%BUILD_DEBUG%] == [optimize] (
+ set FLAVOR=WINNT5.0_OPT.OBJ
+) else (
+ set FLAVOR=WINNT5.0_DBG.OBJ
+)
+
+rem ======== Set Various Build Directories ========
+set OBJDEST=..\built\%FLAVOR%
+rem ------ Convert OBJEST to absolute ------
+call :relative %OBJDEST% OBJDEST
+
+set LIBROOT=..\components\%FLAVOR%
+rem ------ Convert LIBROOT to absolute ------
+call :relative %LIBROOT% LIBROOT
+mkdir %LIBROOT%
+
+set PKGDIR=%OBJDEST%\package\ntds
+mkdir %PKGDIR%
+
+set DISTDIR=..\dist\%FLAVOR%
+rem ------ Convert DISTDIR to absolute ------
+call :relative %DISTDIR% DISTDIR
+mkdir %DISTDIR%
+
+set WXSDIR=%CD%\wix
+
+rem ======== Fetch Components ========
+if [%INTERNAL_BUILD%] == [1] (
+ set COMPONENT_URL=http://ftp-rel.sfbay.redhat.com/share/builds/components
+) else (
+ set COMPONENT_URL=http://directory.fedora.redhat.com/built/components
+)
+
+rem ------ ApacheDS ------
+set APACHEDS_LOCATION=%COMPONENT_URL%/apacheds/0.9
+set APACHEDSSOURCE=%OBJDEST%\apacheds\apacheds-0.9
+set APACHEDS_FILE=%LIBROOT%\apacheds\apacheds-main-0.9.jar
+if NOT EXIST %LIBROOT%\apacheds (
+ pushd %CD%
+ mkdir %LIBROOT%\apacheds
+ cd %LIBROOT%\apacheds
+ echo %APACHEDS_LOCATION% > version.txt
+ wget --no-directories %APACHEDS_LOCATION%/apacheds-0.9-src.zip
+ unzip -q -d%OBJDEST%\apacheds apacheds-0.9-src.zip
+ wget --no-directories %APACHEDS_LOCATION%/apacheds-main-0.9.jar
+ popd
+)
+
+rem ------ Wrapper ------
+set WRAPPER_LOCATION=%COMPONENT_URL%/wrapper/3.1.2
+set WRAPPER_FILES=%LIBROOT%\wrapper\wrapper_win32_3.1.2
+if NOT EXIST %LIBROOT%\wrapper (
+ pushd %CD%
+ mkdir %LIBROOT%\wrapper
+ cd %LIBROOT%\wrapper
+ echo %WRAPPER_LOCATION% > version.txt
+ wget --no-directories %WRAPPER_LOCATION%/wrapper_win32_3.1.2.zip
+ unzip -q wrapper_win32_3.1.2.zip
+ popd
+)
+
+set OK=0
+
+pushd %CD%
+
+rem ======== Build ========
+rem ------ Netman ------
+cd netman
+echo -------- Beginning Netman Build --------
+
+nmake /f netman.mak
+set /a OK=%OK% + %ERRORLEVEL%
+
+if [%OK%] GTR [1] (
+ echo -------- Netman Build Failed! --------
+ goto :END
+) else (
+ echo -------- Netman Build Successful! --------
+)
+
+rem ------ ApacheDS ------
+cd ..\apacheds
+echo -------- Beginning ApacheDS Build --------
+
+nmake /f apacheds.mak
+set /a OK=%OK% + %ERRORLEVEL%
+
+if [%OK%] GTR [1] (
+ echo -------- ApacheDS Build Failed! --------
+ goto :END
+) else (
+ echo -------- ApacheDS Build Successful! --------
+)
+
+rem ======== Package ========
+cd ..
+echo -------- Beginning Packaging --------
+
+nmake /f package.mak
+set /a OK=%OK% + %ERRORLEVEL%
+
+if EXIST %PKGDIR%\ntds.msi (
+ copy /Y %PKGDIR%\ntds.msi %DISTDIR%
+ set /a OK=%OK% + %ERRORLEVEL%
+)
+
+if [%OK%] GTR [1] (
+ echo -------- Packaging Failed! --------
+ goto :END
+) else (
+ echo -------- Packaging Successful! --------
+)
+
+:END
+popd
+if [%OK%] GTR [1] (
+ echo -------- Build Failed! --------
+ set OK=1
+) else (
+ echo -------- Build Successful! --------
+)
+exit %OK%
+
+:relative
+rem ======== Converts relative path to absolute path ========
+rem ------ %1 is the path, %2 is the variable to be set ------
+set %2=%~f1
+goto :EOF
Index: package.mak
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/package.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.mak 10 Nov 2005 00:36:51 -0000 1.2
+++ package.mak 10 Nov 2005 04:18:15 -0000 1.3
@@ -1,72 +1,72 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Packaging nmake Makefile for ntds.msi
-#
-
-ALL : ntds.msi
-
-LAYOUT :
- mkdir "$(PKGDIR)\bin"
- copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
- copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
- copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
- copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
- copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
- copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
- copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
-
- mkdir "$(PKGDIR)\conf"
- copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
- copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
-
- mkdir "$(PKGDIR)\lib"
- copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
- copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
- copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
-
- mkdir "$(PKGDIR)\logs"
-
-
-ntds.msi : LAYOUT
- mkdir "$(PKGDIR)\Binary"
- copy /Y wix\Binary "$(PKGDIR)\Binary"
- cd "$(PKGDIR)"
- candle "$(WXSDIR)\ntds.wxs"
- light ntds.wixobj
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# Packaging nmake Makefile for ntds.msi
+#
+
+ALL : ntds.msi
+
+LAYOUT :
+ mkdir "$(PKGDIR)\bin"
+ copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
+ copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
+ copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
+ copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
+ copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
+ copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
+ copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
+
+ mkdir "$(PKGDIR)\conf"
+ copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
+ copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
+
+ mkdir "$(PKGDIR)\lib"
+ copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
+ copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
+ copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
+
+ mkdir "$(PKGDIR)\logs"
+
+
+ntds.msi : LAYOUT
+ mkdir "$(PKGDIR)\Binary"
+ copy /Y wix\Binary "$(PKGDIR)\Binary"
+ cd "$(PKGDIR)"
+ candle "$(WXSDIR)\ntds.wxs"
+ light ntds.wixobj
18 years, 5 months
- 1
- 0