diff --git a/modules/appfilelocprovider/public/Makefile.in b/modules/appfilelocprovider/public/Makefile.in new file mode 100644 index 000000000000..a367bf928cc9 --- /dev/null +++ b/modules/appfilelocprovider/public/Makefile.in @@ -0,0 +1,42 @@ +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH =../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +EXPORTS = \ + nsAppFileLocationProvider.h \ + nsAppFileLocProviderCID.h \ + $(NULL) + + +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) + +include $(topsrcdir)/config/rules.mk + + + + + diff --git a/modules/appfilelocprovider/src/Makefile.in b/modules/appfilelocprovider/src/Makefile.in new file mode 100644 index 000000000000..1b7ec4c1cdc7 --- /dev/null +++ b/modules/appfilelocprovider/src/Makefile.in @@ -0,0 +1,39 @@ +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +MODULE = xpfelocations +LIBRARY_NAME = xpfelocation_s + +CPPSRCS = nsAppFileLocationProvider.cpp + +# we don't want the shared lib +override NO_SHARED_LIB=1 +override NO_STATIC_LIB= + +include $(topsrcdir)/config/rules.mk + diff --git a/modules/appfilelocprovider/src/nsAppFileLocationProvider.cpp b/modules/appfilelocprovider/src/nsAppFileLocationProvider.cpp index e2a44bb5c5c7..ab9a8ce289ee 100755 --- a/modules/appfilelocprovider/src/nsAppFileLocationProvider.cpp +++ b/modules/appfilelocprovider/src/nsAppFileLocationProvider.cpp @@ -40,6 +40,11 @@ static nsresult GetMacFolder(OSType folderType, nsILocalFile** aFile); #include #include static nsresult GetWindowsFolder(int folder, nsILocalFile** aFile); +#elif defined(XP_UNIX) +#include +#include +#include +#include #endif static nsresult GetChromeLocale(PRUnichar** localeName); static nsresult GetCurrentProcessDirectory(nsILocalFile** aFile); @@ -479,7 +484,7 @@ static nsresult GetDefaultUserProfileRoot(nsILocalFile **aLocalFile) NS_ENSURE_SUCCESS(rv, rv); } #elif defined(XP_UNIX) - rv = NS_NewLocalFile(PR_GetEnv("HOME"), aLocalFile); + rv = NS_NewLocalFile(PR_GetEnv("HOME"), PR_TRUE, aLocalFile); NS_ENSURE_SUCCESS(rv, rv); pLocalFile = *aLocalFile; pLocalFile->AppendRelativePath(".mozilla"); diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp index e2a44bb5c5c7..ab9a8ce289ee 100755 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp @@ -40,6 +40,11 @@ static nsresult GetMacFolder(OSType folderType, nsILocalFile** aFile); #include #include static nsresult GetWindowsFolder(int folder, nsILocalFile** aFile); +#elif defined(XP_UNIX) +#include +#include +#include +#include #endif static nsresult GetChromeLocale(PRUnichar** localeName); static nsresult GetCurrentProcessDirectory(nsILocalFile** aFile); @@ -479,7 +484,7 @@ static nsresult GetDefaultUserProfileRoot(nsILocalFile **aLocalFile) NS_ENSURE_SUCCESS(rv, rv); } #elif defined(XP_UNIX) - rv = NS_NewLocalFile(PR_GetEnv("HOME"), aLocalFile); + rv = NS_NewLocalFile(PR_GetEnv("HOME"), PR_TRUE, aLocalFile); NS_ENSURE_SUCCESS(rv, rv); pLocalFile = *aLocalFile; pLocalFile->AppendRelativePath(".mozilla"); diff --git a/xpfe/appfilelocprovider/public/Makefile.in b/xpfe/appfilelocprovider/public/Makefile.in new file mode 100644 index 000000000000..a367bf928cc9 --- /dev/null +++ b/xpfe/appfilelocprovider/public/Makefile.in @@ -0,0 +1,42 @@ +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH =../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +EXPORTS = \ + nsAppFileLocationProvider.h \ + nsAppFileLocProviderCID.h \ + $(NULL) + + +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) + +include $(topsrcdir)/config/rules.mk + + + + + diff --git a/xpfe/appfilelocprovider/src/Makefile.in b/xpfe/appfilelocprovider/src/Makefile.in new file mode 100644 index 000000000000..1b7ec4c1cdc7 --- /dev/null +++ b/xpfe/appfilelocprovider/src/Makefile.in @@ -0,0 +1,39 @@ +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +MODULE = xpfelocations +LIBRARY_NAME = xpfelocation_s + +CPPSRCS = nsAppFileLocationProvider.cpp + +# we don't want the shared lib +override NO_SHARED_LIB=1 +override NO_STATIC_LIB= + +include $(topsrcdir)/config/rules.mk + diff --git a/xpfe/appfilelocprovider/src/nsAppFileLocationProvider.cpp b/xpfe/appfilelocprovider/src/nsAppFileLocationProvider.cpp index e2a44bb5c5c7..ab9a8ce289ee 100755 --- a/xpfe/appfilelocprovider/src/nsAppFileLocationProvider.cpp +++ b/xpfe/appfilelocprovider/src/nsAppFileLocationProvider.cpp @@ -40,6 +40,11 @@ static nsresult GetMacFolder(OSType folderType, nsILocalFile** aFile); #include #include static nsresult GetWindowsFolder(int folder, nsILocalFile** aFile); +#elif defined(XP_UNIX) +#include +#include +#include +#include #endif static nsresult GetChromeLocale(PRUnichar** localeName); static nsresult GetCurrentProcessDirectory(nsILocalFile** aFile); @@ -479,7 +484,7 @@ static nsresult GetDefaultUserProfileRoot(nsILocalFile **aLocalFile) NS_ENSURE_SUCCESS(rv, rv); } #elif defined(XP_UNIX) - rv = NS_NewLocalFile(PR_GetEnv("HOME"), aLocalFile); + rv = NS_NewLocalFile(PR_GetEnv("HOME"), PR_TRUE, aLocalFile); NS_ENSURE_SUCCESS(rv, rv); pLocalFile = *aLocalFile; pLocalFile->AppendRelativePath(".mozilla");