[Libreoffice-commits] core.git: Branch 'private/tbsdy/workbench' - sal/Executable_getenvvars.mk sal/workben
Chris Sherlock
chris.sherlock79 at gmail.com
Sun Aug 13 14:10:54 UTC 2017
sal/Executable_getenvvars.mk | 31 ---------------------------
sal/workben/osl/getenvvars.cxx | 47 -----------------------------------------
2 files changed, 78 deletions(-)
New commits:
commit 5004a4667c91706695b663ef245bee4e56ece940
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Mon Aug 14 00:09:51 2017 +1000
sal workben: remove failed experiment
Change-Id: Idf6a421377b1ca21326adff2b9c87e9794c65dda
diff --git a/sal/Executable_getenvvars.mk b/sal/Executable_getenvvars.mk
deleted file mode 100644
index d82a0b420808..000000000000
--- a/sal/Executable_getenvvars.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Executable_Executable,getenvvars))
-
-$(eval $(call gb_Executable_set_include,getenvvars,\
- $$(INCLUDE) \
- -I$(SRCDIR)/sal/inc \
-))
-
-$(eval $(call gb_Library_add_defs,getenvvars,\
- -DSAL_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Executable_use_libraries,getenvvars,\
- sal \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,getenvvars,\
- sal/workben/osl/getenvvars \
-))
-
-$(call gb_Executable_get_clean_target,getenvvars) :
- rm -f $(WORKDIR)/LinkTarget/Executable/getenvvars
-# vim: set ts=4 sw=4 et:
diff --git a/sal/workben/osl/getenvvars.cxx b/sal/workben/osl/getenvvars.cxx
deleted file mode 100644
index c29c20379bbe..000000000000
--- a/sal/workben/osl/getenvvars.cxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sal/main.h>
-#include <osl/process.h>
-#include <osl/thread.h>
-
-#include <cstdio>
-#include <wchar.h>
-
-SAL_IMPLEMENT_MAIN()
-{
- sal_Unicode **ppustrEnvVars=nullptr;
-
- fprintf(stdout, "Getting environment variables.\n");
-
- osl_getAllEnvironment(ppustrEnvVars);
-
- do
- {
- fprintf(stdout, "In loop\n");
- if (wcslen(reinterpret_cast< wchar_t* >(ppustrEnvVars)) == 0)
- break;
- fprintf(stdout, " %S", reinterpret_cast< wchar_t* >(ppustrEnvVars));
- ppustrEnvVars += sizeof(wchar_t) * (wcslen(reinterpret_cast< wchar_t* >(ppustrEnvVars)) + 1);
- } while(true);
-
- return 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list