[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.40, 1.41
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16696/ldapserver/ldap/admin/src
Modified Files:
create_instance.c
Log Message:
Resolves: bug 224606
Bug Description: Instance specific dirs should be in instance directory
Reviewed by: nhosoi (Thanks!)
Fix Description: Fixed create instance to create these instance specific directories:
/var/lock/slapd-instance -> /var/lock/fedora-ds/slapd-instance
/var/lib/slapd-instance -> /var/lib/fedora-ds/slapd-instance
/var/log/slapd-instance -> /var/log/fedora-ds/slapd-instance
/var/run/slapd-instance -> /var/run/fedora-ds
For now, I'm side-stepping the question of what to do about permissions on /var/run/fedora-ds/slapd-instance.pid - we'll address this in the RPM creation.
I've also moved the migration scripts to the %{_libdir}/fedora-ds/slapd-instance directory, and I've made the default directory for the key/cert db the same as the config directory. I think the dynamic nature of their configuration warrants the move.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- create_instance.c 25 Jan 2007 16:47:45 -0000 1.40
+++ create_instance.c 26 Jan 2007 20:00:40 -0000 1.41
@@ -754,7 +754,9 @@
table[12][1] = cf->config_dir;
table[13][0] = "RUN-DIR";
table[13][1] = cf->run_dir;
- table[14][0] = table[14][1] = NULL;
+ table[14][0] = "PRODUCT-NAME";
+ table[14][1] = PRODUCT_NAME;
+ table[15][0] = table[15][1] = NULL;
if (generate_script(ofn, fn, NEWSCRIPT_MODE, table) != 0) {
return make_error("Could not write %s to %s (%s).", ofn, fn,
@@ -764,76 +766,6 @@
return NULL;
}
-char *gen_perl_script_auto_for_migration(char *s_root, char *cs_path, char *name,
- server_config_s *cf)
-{
- char myperl[PATH_SIZE];
- char fn[PATH_SIZE], ofn[PATH_SIZE];
- const char *table[16][2];
- char *fnp = NULL;
- int fnlen = 0;
-
- PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s",
- cf->datadir, FILE_PATHSEP, cf->brand_ds,
- FILE_PATHSEP, FILE_PATHSEP, name);
- PR_snprintf(fn, sizeof(fn), "%s%c%s%cbin",
- cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP);
- create_instance_mkdir(fn, NEWDIR_MODE);
- fnlen = strlen(fn);
- fnp = fn + fnlen;
- PR_snprintf(fnp, sizeof(fn) - fnlen, "%c%s", FILE_PATHSEP, name);
-
-#ifdef USE_NSPERL
- PR_snprintf(myperl, sizeof(myperl), "!%s%cbin%cslapd%cadmin%cbin%cperl",
- cf->prefix, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP,
- FILE_PATHSEP, FILE_PATHSEP);
-#else
- strcpy(myperl, "!/usr/bin/env perl");
-#endif
-
- table[0][0] = "DS-ROOT";
- table[0][1] = cf->prefix;
- table[1][0] = "DS-BRAND";
- table[1][1] = cf->brand_ds;
- table[2][0] = "SEP";
- table[2][1] = FILE_PATHSEPP;
- table[3][0] = "SERVER-NAME";
- table[3][1] = cf->servname;
- table[4][0] = "SERVER-PORT";
- table[4][1] = cf->servport;
- table[5][0] = "PERL-EXEC";
- table[6][0] = "DEV-NULL";
-#if !defined( XP_WIN32 )
- table[5][1] = myperl;
- table[6][1] = " /dev/null ";
-#else
- table[5][1] = " perl script";
- table[6][1] = " NUL ";
-#endif
- table[7][0] = "ROOT-DN";
- table[7][1] = cf->rootdn;
- table[8][0] = "LDIF-DIR";
- table[8][1] = cf->ldif_dir;
- table[9][0] = "SERV-ID";
- table[9][1] = cf->servid;
-
- table[10][0] = "BAK-DIR";
- table[10][1] = cf->bak_dir;
- table[11][0] = "SERVER-DIR";
- table[11][1] = cf->sroot;
- table[12][0] = "CONFIG-DIR";
- table[12][1] = cf->config_dir;
- table[13][0] = "RUN-DIR";
- table[13][1] = cf->run_dir;
- table[14][0] = table[14][1] = NULL;
-
- if (generate_script(ofn, fn, NEWSCRIPT_MODE, table) != 0) {
- return make_error("Could not write %s to %s (%s).", ofn, fn,
- ds_system_errmsg());
- }
-
- return NULL;
-}
/* ------------------ NT utilities for server creation ------------------ */
@@ -1809,16 +1741,16 @@
gen_script_auto(mysroot, cs_path, _commandName, cf)
#define CREATE_MIGRATE5TO7() \
- gen_perl_script_auto_for_migration(mysroot, mycs_path, "migrate5to7", cf)
+ gen_script_auto(mysroot, mycs_path, "migrate5to7", cf)
#define CREATE_MIGRATE6TO7() \
- gen_perl_script_auto_for_migration(mysroot, mycs_path, "migrate6to7", cf)
+ gen_script_auto(mysroot, mycs_path, "migrate6to7", cf)
#define CREATE_MIGRATEINSTANCE7() \
- gen_perl_script_auto_for_migration(mysroot, mycs_path, "migrateInstance7", cf)
+ gen_script_auto(mysroot, mycs_path, "migrateInstance7", cf)
#define CREATE_MIGRATETO7() \
- gen_perl_script_auto_for_migration(mysroot, mycs_path, "migrateTo7", cf)
+ gen_script_auto(mysroot, mycs_path, "migrateTo7", cf)
#define CREATE_NEWPWPOLICY() \
gen_script_auto(mysroot, mycs_path, "ns-newpwpolicy.pl", cf)
@@ -4300,14 +4232,14 @@
* cf->datadir: %{_datadir}
* cf->docdir: %{_docdir}
* cf->inst_dir: <sroot>/slapd-<servid>
- * cf->config_dir: <localstatedir>/lib/slapd-<servid>
- * cf->schema_dir: <localstatedir>/lib/slapd-<servid>/schema
- * cf->lock_dir: <localstatedir>/lock/slapd-<servid>
- * cf->log_dir: <localstatedir>/log/slapd-<servid>
- * cf->run_dir: <localstatedir>/run/slapd-<servid>
- * cf->db_dir: <localstatedir>/lib/slapd-<servid>/db
- * cf->bak_dir: <localstatedir>/lib/slapd-<servid>/bak
- * cf->tmp_dir: <localstatedir>/tmp/slapd-<servid>
+ * cf->config_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid>
+ * cf->schema_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid>/schema
+ * cf->lock_dir: <localstatedir>/lock/BRAND_DS/slapd-<servid>
+ * cf->log_dir: <localstatedir>/log/BRAND_DS/slapd-<servid>
+ * cf->run_dir: <localstatedir>/run/BRAND_DS (slapd-instance.pid slapd-instance.startpid files)
+ * cf->db_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid>/db
+ * cf->bak_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid>/bak
+ * cf->tmp_dir: <localstatedir>/tmp/BRAND_DS/slapd-<servid>
* cf->ldif_dir: <datadir>/<brand-ds>/ldif
* cf->cert_dir: <sysconfdir>/BRAND_DS/slapd-<servid>
* cf->sasl_path: <sroot>/sasl2
@@ -4542,8 +4474,9 @@
temp = ds_a_get_cgi_var("config_dir", NULL, NULL);
if (NULL == temp) {
- cf->config_dir = PR_smprintf("%s%clib%c%s-%s",
+ cf->config_dir = PR_smprintf("%s%clib%c%s%c%s-%s",
cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->brand_ds, FILE_PATHSEP,
PRODUCT_NAME, cf->servid);
} else {
cf->config_dir = PL_strdup(temp);
@@ -4554,8 +4487,9 @@
cf->schema_dir = ds_a_get_cgi_var("schema_dir", NULL, NULL);
temp = ds_a_get_cgi_var("schema_dir", NULL, NULL);
if (NULL == temp) {
- cf->schema_dir = PR_smprintf("%s%clib%c%s-%s%cschema",
+ cf->schema_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cschema",
cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->brand_ds, FILE_PATHSEP,
PRODUCT_NAME, cf->servid, FILE_PATHSEP);
} else {
cf->schema_dir = PL_strdup(temp);
@@ -4563,8 +4497,9 @@
temp = ds_a_get_cgi_var("lock_dir", NULL, NULL);
if (NULL == temp) {
- cf->lock_dir = PR_smprintf("%s%clock%c%s-%s",
+ cf->lock_dir = PR_smprintf("%s%clock%c%s%c%s-%s",
cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->brand_ds, FILE_PATHSEP,
PRODUCT_NAME, cf->servid);
} else {
cf->lock_dir = PL_strdup(temp);
@@ -4572,8 +4507,9 @@
temp = ds_a_get_cgi_var("log_dir", NULL, NULL);
if (NULL == temp) {
- cf->log_dir = PR_smprintf("%s%clog%c%s-%s",
+ cf->log_dir = PR_smprintf("%s%clog%c%s%c%s-%s",
cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->brand_ds, FILE_PATHSEP,
PRODUCT_NAME, cf->servid);
} else {
cf->log_dir = PL_strdup(temp);
@@ -4581,9 +4517,9 @@
temp = ds_a_get_cgi_var("run_dir", NULL, NULL);
if (NULL == temp) {
- cf->run_dir = PR_smprintf("%s%crun%c%s-%s",
+ cf->run_dir = PR_smprintf("%s%crun%c%s",
cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
- PRODUCT_NAME, cf->servid);
+ cf->brand_ds);
} else {
cf->run_dir = PL_strdup(temp);
}
@@ -4592,8 +4528,9 @@
temp = ds_a_get_cgi_var("db_dir", NULL, NULL);
if (NULL == temp) {
- cf->db_dir = PR_smprintf("%s%clib%c%s-%s%cdb",
+ cf->db_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cdb",
cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->brand_ds, FILE_PATHSEP,
PRODUCT_NAME, cf->servid, FILE_PATHSEP);
} else {
cf->db_dir = PL_strdup(temp);
@@ -4601,8 +4538,9 @@
temp = ds_a_get_cgi_var("bak_dir", NULL, NULL);
if (NULL == temp) {
- cf->bak_dir = PR_smprintf("%s%clib%c%s-%s%cbak",
+ cf->bak_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cbak",
cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->brand_ds, FILE_PATHSEP,
PRODUCT_NAME, cf->servid, FILE_PATHSEP);
} else {
cf->bak_dir = PL_strdup(temp);
@@ -4613,15 +4551,16 @@
temp = ds_a_get_cgi_var("ldif_dir", NULL, NULL);
if (NULL == temp) {
cf->ldif_dir = PR_smprintf("%s%c%s%cldif",
- cf->datadir, FILE_PATHSEP, BRAND_DS, FILE_PATHSEP);
+ cf->datadir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP);
} else {
cf->ldif_dir = PL_strdup(temp);
}
temp = ds_a_get_cgi_var("tmp_dir", NULL, NULL);
if (NULL == temp) {
- cf->tmp_dir = PR_smprintf("%s%ctmp%c%s-%s",
+ cf->tmp_dir = PR_smprintf("%s%ctmp%c%s%c%s-%s",
cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+ cf->brand_ds, FILE_PATHSEP,
PRODUCT_NAME, cf->servid);
} else {
cf->tmp_dir = PL_strdup(temp);
@@ -4631,9 +4570,7 @@
temp = ds_a_get_cgi_var("cert_dir", NULL, NULL);
if (NULL == temp) {
- cf->cert_dir = PR_smprintf("%s%c%s%c%s-%s",
- cf->sysconfdir, FILE_PATHSEP, cf->brand_ds,
- FILE_PATHSEP, PRODUCT_NAME, cf->servid);
+ cf->cert_dir = PL_strdup(cf->config_dir);
} else {
cf->cert_dir = PL_strdup(temp);
}
17 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-start-slapd.in, 1.3, 1.4 template-stop-slapd.in, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16696/ldapserver/ldap/admin/src/scripts
Modified Files:
template-start-slapd.in template-stop-slapd.in
Log Message:
Resolves: bug 224606
Bug Description: Instance specific dirs should be in instance directory
Reviewed by: nhosoi (Thanks!)
Fix Description: Fixed create instance to create these instance specific directories:
/var/lock/slapd-instance -> /var/lock/fedora-ds/slapd-instance
/var/lib/slapd-instance -> /var/lib/fedora-ds/slapd-instance
/var/log/slapd-instance -> /var/log/fedora-ds/slapd-instance
/var/run/slapd-instance -> /var/run/fedora-ds
For now, I'm side-stepping the question of what to do about permissions on /var/run/fedora-ds/slapd-instance.pid - we'll address this in the RPM creation.
I've also moved the migration scripts to the %{_libdir}/fedora-ds/slapd-instance directory, and I've made the default directory for the key/cert db the same as the config directory. I think the dynamic nature of their configuration warrants the move.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: template-start-slapd.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-start-slapd.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-start-slapd.in 28 Nov 2006 17:13:48 -0000 1.3
+++ template-start-slapd.in 26 Jan 2007 20:00:45 -0000 1.4
@@ -16,8 +16,8 @@
export NETSITE_ROOT
DS_CONFIG_DIR={{CONFIG-DIR}}
export DS_CONFIG_DIR
-PIDFILE={{RUN-DIR}}/pid
-STARTPIDFILE={{RUN-DIR}}/startpid
+PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid
+STARTPIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.startpid
if test -f $STARTPIDFILE ; then
PID=`cat $STARTPIDFILE`
if kill -0 $PID > /dev/null 2>&1 ; then
Index: template-stop-slapd.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-stop-slapd.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-stop-slapd.in 28 Nov 2006 17:13:48 -0000 1.3
+++ template-stop-slapd.in 26 Jan 2007 20:00:45 -0000 1.4
@@ -12,7 +12,7 @@
# 1: Server could not be stopped
# 2: Server was not running
-PIDFILE={{RUN-DIR}}/pid
+PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid
if test ! -f $PIDFILE ; then
echo No ns-slapd PID file found. Server is probably not running
exit 2
17 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/admin/lib dsalib_updown.c, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16696/ldapserver/ldap/admin/lib
Modified Files:
dsalib_updown.c
Log Message:
Resolves: bug 224606
Bug Description: Instance specific dirs should be in instance directory
Reviewed by: nhosoi (Thanks!)
Fix Description: Fixed create instance to create these instance specific directories:
/var/lock/slapd-instance -> /var/lock/fedora-ds/slapd-instance
/var/lib/slapd-instance -> /var/lib/fedora-ds/slapd-instance
/var/log/slapd-instance -> /var/log/fedora-ds/slapd-instance
/var/run/slapd-instance -> /var/run/fedora-ds
For now, I'm side-stepping the question of what to do about permissions on /var/run/fedora-ds/slapd-instance.pid - we'll address this in the RPM creation.
I've also moved the migration scripts to the %{_libdir}/fedora-ds/slapd-instance directory, and I've made the default directory for the key/cert db the same as the config directory. I think the dynamic nature of their configuration warrants the move.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: dsalib_updown.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_updown.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dsalib_updown.c 10 Nov 2006 23:44:32 -0000 1.8
+++ dsalib_updown.c 26 Jan 2007 20:00:40 -0000 1.9
@@ -95,7 +95,7 @@
fprintf(stderr, "ds_get_updown_status: could not get install root\n");
return(DS_SERVER_UNKNOWN);
}
- PR_snprintf(pid_file_name, BIG_LINE, "%s/pid", rundir);
+ PR_snprintf(pid_file_name, BIG_LINE, "%s/%s.pid", ds_get_server_name(), rundir);
pidfile = fopen(pid_file_name, "r");
if ( pidfile == NULL ) {
/*
17 years, 2 months
[Fedora-directory-commits] esc/src/xulrunner Makefile,1.3,1.3.2.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/xulrunner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7587
Modified Files:
Tag: ESC_CS_72_BRANCH
Makefile
Log Message:
Mac Universal binary.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/xulrunner/Makefile,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- Makefile 25 Jan 2007 22:36:20 -0000 1.3
+++ Makefile 26 Jan 2007 01:38:12 -0000 1.3.2.1
@@ -70,6 +70,11 @@
echo "ac_add_options --with-system-nspr" >> $@.$(TYPE)
echo "ac_add_options --with-system-nss" >> $@.$(TYPE)
endif
+ifeq ($(OS_ARCH),Darwin)
+ echo ". \$$topsrcdir/build/macosx/universal/mozconfig" >> $@.$(TYPE)
+ echo "ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk" >> $@.$(TYPE)
+endif
+
ifeq ($(OS_ARCH), WINNT)
echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE)
endif
17 years, 2 months
[Fedora-directory-commits] esc/src/lib/NssHttpClient Makefile, 1.1, 1.1.2.1 manifest.mn, 1.2, 1.2.2.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/NssHttpClient
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554
Modified Files:
Tag: ESC_CS_72_BRANCH
Makefile manifest.mn
Log Message:
Mac Universal binary.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Makefile 12 Jun 2006 23:39:53 -0000 1.1
+++ Makefile 26 Jan 2007 01:37:14 -0000 1.1.2.1
@@ -21,11 +21,13 @@
# (1) Include initial platform-independent assignments (MANDATORY). #
#######################################################################
-include manifest.mn
+
+#include manifest.mn
include config.mk
+include manifest.mn
#######################################################################
# (2) Include "global" configuration information. (OPTIONAL) #
@@ -68,3 +70,11 @@
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
+
+UNIVERSAL_OFFSET=
+ifeq ($(OS_ARCH), Darwin)
+UNIVERSAL_OFFSET=i386
+XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build/$(UNIVERSAL_OFFSET)
+
+DEFINES += -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk
+endif
Index: manifest.mn
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/manifest.mn,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- manifest.mn 27 Sep 2006 17:49:21 -0000 1.2
+++ manifest.mn 26 Jan 2007 01:37:14 -0000 1.2.2.1
@@ -17,6 +17,9 @@
CORE_DEPTH = ../../..
+XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build
+
+
SYS_INC = /usr/include
MODULE = httpchunked
LIBRARY_NAME = $(MODULE)
@@ -25,8 +28,10 @@
ifndef MOZ_OFFSET
MOZ_OFFSET = mozilla-1.7.13
endif
+
+
MAPFILE = $(OBJDIR)/httpchunked.def
-DEFINES = -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss
+DEFINES = -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr
CPPSRCS = \
Cache.cpp \
17 years, 2 months
[Fedora-directory-commits] esc/src/lib/coolkey Makefile, 1.1, 1.1.2.1 manifest.mn, 1.2, 1.2.2.1 CoolKey.cpp, 1.2, 1.2.2.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7520
Modified Files:
Tag: ESC_CS_72_BRANCH
Makefile manifest.mn CoolKey.cpp
Log Message:
Mac Universal binary.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Makefile 12 Jun 2006 23:39:52 -0000 1.1
+++ Makefile 26 Jan 2007 01:36:12 -0000 1.1.2.1
@@ -8,7 +8,7 @@
# 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.
@@ -17,57 +17,30 @@
# All rights reserved.
# END COPYRIGHT BLOCK
+UNIVERSAL_OFFSET_PPC=ppc
+UNIVERSAL_OFFSET_386=i386
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY). #
-#######################################################################
-
-include manifest.mn
-
-include config.mk
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL) #
-#######################################################################
-
+CORE_DEPTH=../../..
include $(CORE_DEPTH)/coreconf/config.mk
-#only want the library
-SHARED_LIBRARY=
-IMPORT_LIBRARY=
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL) #
-#######################################################################
-
-DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\"
-DEFINES += -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
-
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL). #
-#######################################################################
-
-#include config.mk
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL) #
-#######################################################################
-
include $(CORE_DEPTH)/coreconf/rules.mk
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL) #
-#######################################################################
+libs::
+ifeq ($(OS_ARCH),Darwin)
+ echo "Build Darwin."
+ make -f Mac-universal.mk
+else
+ echo "Build Linux or Windows."
+ make -f common.mk
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL). #
-#######################################################################
-
-
-ifeq ($(OS_ARCH), WINNT)
-#CPPSRCS += CoolKeyCSP.cpp
endif
+ifeq ($(OS_ARCH),Darwin)
+clean::
+ echo "Cleaning."
+ rm -rf $(UNIVERSAL_OFFSET_PPC)
+ rm -rf $(UNIVERSAL_OFFSET_386)
+ make -f common.mk clean
+endif
Index: manifest.mn
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/manifest.mn,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- manifest.mn 27 Sep 2006 17:47:46 -0000 1.2
+++ manifest.mn 26 Jan 2007 01:36:12 -0000 1.2.2.1
@@ -17,6 +17,9 @@
CORE_DEPTH = ../../..
+XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build
+
+
SYS_INC = /usr/include
MODULE = ckymanager
LIBRARY_NAME = $(MODULE)
@@ -24,7 +27,7 @@
ifndef MOZ_OFFSET
MOZ_OFFSET = mozilla-1.7.13
endif
-DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss
+DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr
MAPFILE = $(OBJDIR)/ckymanager.def
#EXTRA_LIBS += -L$(DIST)/lib -lckyapplet
Index: CoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- CoolKey.cpp 27 Sep 2006 17:47:46 -0000 1.2
+++ CoolKey.cpp 26 Jan 2007 01:36:12 -0000 1.2.2.1
@@ -860,9 +860,11 @@
HRESULT result = S_OK;
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardCreate_Context.\n"));
CKYCardContext *cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER);
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardCreate_Context. \n"));
assert(cardCtxt);
if (!cardCtxt) {
PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't create Card Context !.\n"));
@@ -870,7 +872,9 @@
goto done;
}
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardConnection_Create.\n"));
conn = CKYCardConnection_Create(cardCtxt);
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardConnection_Create.\n"));
assert(conn);
if (!conn) {
PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't create Card Connection!\n"));
@@ -878,7 +882,9 @@
goto done;
}
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before GetReaderNameForKeyID.\n"));
readerName = GetReaderNameForKeyID(aKey);
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After GetReaderNameForKeyID.\n"));
assert(readerName);
if (!readerName) {
PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't get reader name!\n"));
@@ -886,7 +892,9 @@
goto done;
}
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardConnection_Connect.\n"));
status = CKYCardConnection_Connect(conn, readerName);
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardConnection_Connect.\n"));
if (status != CKYSUCCESS) {
PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't connect to Card!\n"));
@@ -894,18 +902,25 @@
goto done;
}
-CKYCardConnection_BeginTransaction(conn);
+ #ifndef DARWIN
+ CKYCardConnection_BeginTransaction(conn);
+ #endif
apduRC = 0;
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYApplet_SelectCoolKeyManager.\n"));
status = CKYApplet_SelectCoolKeyManager(conn, &apduRC);
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYApplet_SelectCoolKeyManager.\n"));
if (status != CKYSUCCESS) {
PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't select CoolKey manager!\n"));
goto done;
}
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYApplet_GetIssuerInfo.\n"));
status = CKYApplet_GetIssuerInfo(conn, &ISSUER_INFO,
&apduRC);
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYApplet_GetIssuerInfo.\n"));
+
if(status != CKYSUCCESS)
{
PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Error actually getting IssuerInfo!\n"));
@@ -941,7 +956,9 @@
done:
if (conn) {
+ #ifndef DARWIN
CKYCardConnection_EndTransaction(conn);
+ #endif
CKYCardConnection_Disconnect(conn);
CKYCardConnection_Destroy(conn);
}
17 years, 2 months
[Fedora-directory-commits] esc/src/app/xpcom/tray Makefile, 1.2, 1.2.2.1 Makefile.moz, 1.3, 1.3.2.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7479
Modified Files:
Tag: ESC_CS_72_BRANCH
Makefile Makefile.moz
Log Message:
Mac Universal binary.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Makefile 13 Sep 2006 17:50:07 -0000 1.2
+++ Makefile 26 Jan 2007 01:34:44 -0000 1.2.2.1
@@ -21,17 +21,23 @@
include $(CORE_DEPTH)/coreconf/config.mk
include $(CORE_DEPTH)/coreconf/rules.mk
+DARWIN_LIB_NAME=librhTray.dylib
+
+
CORE_INC=$(SOURCE_XP_DIR)/public
MOZ_SRCDIR=$(SOURCE_XP_DIR)/src/mozilla
MOZ_OBJDIR=$(DIST)/xulrunner_build
-ifeq ($(OS_ARCH), Darwin)
-#MOZ_OBJDIR=$(MOZ_SRCDIR)
-endif
-ifeq ($(OS_ARCH),Linux)
+UNIVERSAL_OFFSET_PPC=ppc
+UNIVERSAL_OFFSET_386=i386
+MOZ_OBJDIR_PPC=
+ifeq ($(OS_ARCH),Darwin)
+MOZ_OBJDIR=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_386)
+MOZ_OBJDIR_PPC=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_PPC)
endif
+
all export install clean deploy args::
echo "***** Dropping into the Mozilla build environment ***** $(MOZ_OBJDIR) $@"
echo $(DIST)
@@ -42,6 +48,16 @@
MOZ_SRCDIR=$(MOZ_SRCDIR) \
MOZ_OBJDIR=$(MOZ_OBJDIR) \
+ifeq ($(OS_ARCH),Darwin)
+ echo "Darwin all"
+ $(MAKE) -f Makefile.moz $@ \
+ OBJDIR=$(OBJDIR) \
+ CORE_DIST=$(DIST) \
+ CORE_INC=$(CORE_INC) \
+ MOZ_SRCDIR=$(MOZ_SRCDIR) \
+ MOZ_OBJDIR=$(MOZ_OBJDIR_PPC)
+endif
+
libs::
$(MAKE) -f Makefile.moz libs \
@@ -49,13 +65,31 @@
CORE_DIST=$(DIST) \
CORE_INC=$(CORE_INC) \
MOZ_SRCDIR=$(MOZ_SRCDIR) \
- MOZ_OBJ_DIR=$(MOZ_OBJDIR) \
+ MOZ_OBJDIR=$(MOZ_OBJDIR) \
+
+ifeq ($(OS_ARCH),Darwin)
+ echo "Darwin libs"
+ mkdir -p $(UNIVERSAL_OFFSET_386)
+ mkdir -p $(UNIVERSAL_OFFSET_PPC)
+ mv -n $(DARWIN_LIB_NAME) i386
+ rm Makefile.in
+ rm *.o
+ $(MAKE) -f Makefile.moz libs \
+ OBJDIR=$(OBJDIR) \
+ CORE_DIST=$(DIST) \
+ CORE_INC=$(CORE_INC) \
+ MOZ_SRCDIR=$(MOZ_SRCDIR) \
+ MOZ_OBJDIR=$(MOZ_OBJDIR_PPC)
+ mv $(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC)
+endif
+ifeq ($(OS_ARCH),Darwin)
+ echo "Darwin Creating UNI binary."
+ lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(DARWIN_LIB_NAME)
+endif
$(MAKE) -f Makefile.moz deploy \
OBJDIR=$(OBJDIR) \
CORE_DIST=$(DIST) \
CORE_INC=$(CORE_INC) \
MOZ_SRCDIR=$(MOZ_SRCDIR) \
- MOZ_OBJ_DIR=$(MOZ_OBJDIR)
-
-
+ MOZ_OBJDIR=$(MOZ_OBJDIR)
Index: Makefile.moz
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile.moz,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- Makefile.moz 25 Oct 2006 03:59:03 -0000 1.3
+++ Makefile.moz 26 Jan 2007 01:34:44 -0000 1.3.2.1
@@ -16,7 +16,9 @@
# ***** END COPYRIGHT BLOCK *****
CORE_DEPTH = ../../../..
-MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build
+#MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build
+#MOZ_OBJDIR=$(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build/i386
+
MOZ_SRCDIR = $(CORE_DEPTH)/dist/src/mozilla
DEPTH = $(MOZ_OBJDIR)
topsrcdir = $(MOZ_SRCDIR)
@@ -32,14 +34,17 @@
NOTIFY_CXX_FLAGS = -I$(NOTIFY_DEPTH) $(shell pkg-config --cflags glib-2.0)
NOTIFY_LDFLAGS = $(shell pkg-config --libs libnotify)
+
NO_DIST_INSTALL = 1
ifeq ($(OS_ARCH),Linux)
endif
+
-include $(MOZ_OBJDIR)/config/autoconf.mk
-DEPLOY_OFFSET=/esc
+#DEPLOY_OFFSET=/esc
+DEPLOY_OFFSET=/src
ifeq ($(OS_ARCH),Linux)
DEPLOY_OFFSET=/src
endif
@@ -96,7 +101,7 @@
endif
ifeq ($(OS_ARCH),Darwin)
-
+#OS_CXXFLAGS += -arch i386 -arch ppc
CPPSRCS = \
rhMacTray.cpp \
$(NULL)
@@ -135,6 +140,10 @@
clean::
rm -f Makefile.in
+ifeq ($(OS_ARCH),Darwin)
+ rm -rf i386
+ rm -rf ppc
+endif
deploy::
echo "Deploying"
17 years, 2 months
[Fedora-directory-commits] esc/src/app/xpcom Makefile, 1.2, 1.2.2.1 Makefile.moz, 1.4, 1.4.2.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7450
Modified Files:
Tag: ESC_CS_72_BRANCH
Makefile Makefile.moz
Log Message:
Mac Universal binary.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Makefile 13 Sep 2006 17:50:07 -0000 1.2
+++ Makefile 26 Jan 2007 01:33:53 -0000 1.2.2.1
@@ -26,6 +26,18 @@
MOZ_SRCDIR=$(SOURCE_XP_DIR)/src/mozilla
MOZ_OBJDIR=$(DIST)/xulrunner_build
+DARWIN_LIB_NAME=librhCoolKey.dylib
+
+UNIVERSAL_OFFSET_PPC=ppc
+UNIVERSAL_OFFSET_386=i386
+MOZ_OBJDIR_PPC=
+ifeq ($(OS_ARCH),Darwin)
+MOZ_OBJDIR=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_386)
+MOZ_OBJDIR_PPC=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_PPC)
+endif
+
+
+
ifeq ($(OS_ARCH),Linux)
endif
@@ -39,6 +51,16 @@
MOZ_SRCDIR=$(MOZ_SRCDIR) \
MOZ_OBJDIR=$(MOZ_OBJDIR) \
+ifeq ($(OS_ARCH),Darwin)
+ echo "Darwin all"
+ $(MAKE) -f Makefile.moz $@ \
+ OBJDIR=$(OBJDIR) \
+ CORE_DIST=$(DIST) \
+ CORE_INC=$(CORE_INC) \
+ MOZ_SRCDIR=$(MOZ_SRCDIR) \
+ MOZ_OBJDIR=$(MOZ_OBJDIR_PPC)
+endif
+
libs::
echo "***** Dropping into the Mozilla build environment ***** $(MOZ_OBJDIR)"
@@ -49,12 +71,30 @@
MOZ_SRCDIR=$(MOZ_SRCDIR) \
MOZ_OBJDIR=$(MOZ_OBJDIR) \
+ifeq ($(OS_ARCH),Darwin)
+ echo "Darwin libs"
+ mkdir -p $(UNIVERSAL_OFFSET_386)
+ mkdir -p $(UNIVERSAL_OFFSET_PPC)
+ mv -n $(DARWIN_LIB_NAME) i386
+ rm Makefile.in
+ rm *.o
+ $(MAKE) -f Makefile.moz libs \
+ OBJDIR=$(OBJDIR) \
+ CORE_DIST=$(DIST) \
+ CORE_INC=$(CORE_INC) \
+ MOZ_SRCDIR=$(MOZ_SRCDIR) \
+ MOZ_OBJDIR=$(MOZ_OBJDIR_PPC)
+ mv $(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC)
+endif
+
+ifeq ($(OS_ARCH),Darwin)
+ echo "Darwin Creating UNI binary."
+ lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(DARWIN_LIB_NAME)
+endif
$(MAKE) -f Makefile.moz deploy \
OBJDIR=$(OBJDIR) \
CORE_DIST=$(DIST) \
CORE_INC=$(CORE_INC) \
MOZ_SRCDIR=$(MOZ_SRCDIR) \
- MOZ_OBJDIR=$(MOZ_OBJDIR) \
-
-
+ MOZ_OBJDIR=$(MOZ_OBJDIR)
Index: Makefile.moz
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.moz,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Makefile.moz 25 Oct 2006 03:58:16 -0000 1.4
+++ Makefile.moz 26 Jan 2007 01:33:53 -0000 1.4.2.1
@@ -1,4 +1,4 @@
-
+#
# 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.
@@ -16,7 +16,7 @@
# ***** END COPYRIGHT BLOCK *****
CORE_DEPTH = ../../..
-MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build
+#MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build
MOZ_SRCDIR = $(CORE_DEPTH)/dist/src/mozilla
DEPTH = $(MOZ_OBJDIR)
topsrcdir = $(MOZ_SRCDIR)
@@ -42,13 +42,14 @@
XULRUNNER_BIN_PATH = $(MOZ_OBJDIR)/dist/xulrunner
XULRUNNER_EXEC = xulrunner
ifeq ($(OS_ARCH), Darwin)
-XULRUNNER_BIN_PATH = /Library/Frameworks/XUL.framework
+XULRUNNER_BIN_PATH = $(MOZ_OBJDIR)/dist/universal/xulrunner/XUL.framework
XULRUNNER_EXEC = xulrunner-bin
XULRUNNER_FRAME_DEST = ESC.app/Contents/Frameworks/XUL.framework
XULRUNNER_FRAME_BASE = ESC.app/Contents/Frameworks
endif
-DEPLOY_OFFSET=/esc
+#DEPLOY_OFFSET=/esc
+DEPLOY_OFFSET=/src
ifeq ($(OS_ARCH),Linux)
DEPLOY_OFFSET=/src
@@ -66,12 +67,23 @@
XPIDL_MODULE = rhCoolKey
LIBRARY_NAME = rhCoolKey
+
+CKY_LIB_LDD=
+ifdef CKY_LIB
+CKY_LIB_LDD = -L$(CKY_LIB)
+endif
+
+
ifeq ($(OS_ARCH),WINNT)
-COOLKEY_LIBS = $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib $(CORE_DIST)/lib/ckyapplet.lib
+COOLKEY_LIBS = $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib $(CKY_LIB_LDD) $(CORE_DIST)/lib/ckyapplet.lib
TESTCPPSRCS = CoolKeyCSP.cpp
MOZ_NO_DEBUG_RTL=1
else
-COOLKEY_LIBS = -L$(CORE_DIST)/lib -lckymanager -lhttpchunked -lckyapplet
+COOLKEY_LIBS = -L$(CORE_DIST)/lib -lhttpchunked -lckymanager $(CKY_LIB_LDD) -lckyapplet
+endif
+
+ifeq ($(OS_ARCH),Darwin)
+COOLKEY_LIBS += -lsystemStubs
endif
IS_COMPONENT = 1
@@ -129,6 +141,10 @@
rm -f Makefile.in
rm -rf $(DEPLOY_OBJDIR)
rm -rf $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/esc
+ifeq ($(OS_ARCH),Darwin)
+ rm -rf ppc
+ rm -rf i386
+endif
deploy: $(DEPLOY_OBJDIR)
echo "deploy! on $(OS_ARCH)"
17 years, 2 months
[Fedora-directory-commits] esc/src/xulrunner Makefile,1.3,1.4
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/xulrunner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25269
Modified Files:
Makefile
Log Message:
Restore Mac Universal binary.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/xulrunner/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 25 Jan 2007 22:36:20 -0000 1.3
+++ Makefile 25 Jan 2007 22:37:42 -0000 1.4
@@ -70,6 +70,11 @@
echo "ac_add_options --with-system-nspr" >> $@.$(TYPE)
echo "ac_add_options --with-system-nss" >> $@.$(TYPE)
endif
+ifeq ($(OS_ARCH),Darwin)
+ echo ". \$$topsrcdir/build/macosx/universal/mozconfig" >> $@.$(TYPE)
+ echo "ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk" >> $@.$(TYPE)
+endif
+
ifeq ($(OS_ARCH), WINNT)
echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE)
endif
17 years, 2 months
[Fedora-directory-commits] esc/src/xulrunner Makefile,1.2,1.3
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/xulrunner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22627
Modified Files:
Makefile
Log Message:
Backout of Mac universal binary.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/xulrunner/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 10 Jan 2007 02:23:17 -0000 1.2
+++ Makefile 25 Jan 2007 22:36:20 -0000 1.3
@@ -70,11 +70,6 @@
echo "ac_add_options --with-system-nspr" >> $@.$(TYPE)
echo "ac_add_options --with-system-nss" >> $@.$(TYPE)
endif
-ifeq ($(OS_ARCH),Darwin)
- echo ". \$$topsrcdir/build/macosx/universal/mozconfig" >> $@.$(TYPE)
- echo "ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk" >> $@.$(TYPE)
-endif
-
ifeq ($(OS_ARCH), WINNT)
echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE)
endif
17 years, 2 months