[Libreoffice-commits] .: 2 commits - RepositoryModule_ooo.mk sane/Makefile sane/Module_sane.mk sane/Package_inc.mk sane/prj twain/Makefile twain/Module_twain.mk twain/Package_inc.mk twain/prj twain/util
Peter Foley
pefoley2 at kemper.freedesktop.org
Sun Sep 18 13:58:05 PDT 2011
RepositoryModule_ooo.mk | 2 ++
sane/Makefile | 38 ++++++++++++++++++++++++++++++++++++++
sane/Module_sane.mk | 34 ++++++++++++++++++++++++++++++++++
sane/Package_inc.mk | 32 ++++++++++++++++++++++++++++++++
sane/prj/build.lst | 3 +--
sane/prj/d.lst | 3 ---
sane/prj/makefile.mk | 40 ++++++++++++++++++++++++++++++++++++++++
twain/Makefile | 38 ++++++++++++++++++++++++++++++++++++++
twain/Module_twain.mk | 36 ++++++++++++++++++++++++++++++++++++
twain/Package_inc.mk | 32 ++++++++++++++++++++++++++++++++
twain/prj/build.lst | 3 +--
twain/prj/d.lst | 3 ---
twain/prj/makefile.mk | 40 ++++++++++++++++++++++++++++++++++++++++
twain/util/makefile.mk | 39 ---------------------------------------
14 files changed, 294 insertions(+), 49 deletions(-)
New commits:
commit 165b95bc248a7b39d57d99622689cdaad790eff5
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Sep 18 11:26:26 2011 -0400
convert twain to gbuild
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index c28040c..6cd1505 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -78,6 +78,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
svtools \
svx \
sw \
+ twain \
toolkit \
tools \
ucbhelper \
diff --git a/twain/Makefile b/twain/Makefile
new file mode 100644
index 0000000..5bedaf0
--- /dev/null
+++ b/twain/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org 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 Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/twain/Module_twain.mk b/twain/Module_twain.mk
new file mode 100644
index 0000000..f66b41b
--- /dev/null
+++ b/twain/Module_twain.mk
@@ -0,0 +1,36 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# 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 Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Module_Module,twain))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,twain,\
+ Package_inc \
+))
+endif
diff --git a/twain/Package_inc.mk b/twain/Package_inc.mk
new file mode 100644
index 0000000..d2c14ed
--- /dev/null
+++ b/twain/Package_inc.mk
@@ -0,0 +1,32 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# 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 Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Package_Package,twain_inc,$(SRCDIR)/twain/inc))
+
+$(eval $(call gb_Package_add_file,twain_inc,inc/external/twain/twain.h,twain.h))
diff --git a/twain/prj/build.lst b/twain/prj/build.lst
index cfeab25..875fc98 100644
--- a/twain/prj/build.lst
+++ b/twain/prj/build.lst
@@ -1,3 +1,2 @@
tw twain : solenv NULL
-tw twain usr1 - all tw_mkout NULL
-tw twain\util nmake - n tw_util NULL
+tw twain\prj nmake - all tw_util NULL
diff --git a/twain/prj/d.lst b/twain/prj/d.lst
index 0827b03..e69de29 100644
--- a/twain/prj/d.lst
+++ b/twain/prj/d.lst
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\twain
-..\%__SRC%\inc\twain.h %_DEST%\inc\external\twain\twain.h
diff --git a/twain/prj/makefile.mk b/twain/prj/makefile.mk
new file mode 100644
index 0000000..85b2566
--- /dev/null
+++ b/twain/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org 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 Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/twain/util/makefile.mk b/twain/util/makefile.mk
deleted file mode 100644
index 043de88..0000000
--- a/twain/util/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..
-PRJNAME := twain
-TARGET := twain
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-
-ALLTAR: $(OUT)$/inc$/twain.h
-
-$(OUT)$/inc$/%: $(PRJ)$/inc$/%
- - $(MKDIR) $(@:d)
- $(COPY) $< $@
commit aee561af31453735d88854020699b2eaecf943a0
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Sep 18 11:23:59 2011 -0400
convert sane to gbuild
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 428d771..c28040c 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
psprint_config \
regexp \
reportdesign \
+ sane \
sax \
sc \
scaddins \
diff --git a/sane/Makefile b/sane/Makefile
new file mode 100644
index 0000000..5bedaf0
--- /dev/null
+++ b/sane/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org 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 Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sane/Module_sane.mk b/sane/Module_sane.mk
new file mode 100644
index 0000000..f77ea2e
--- /dev/null
+++ b/sane/Module_sane.mk
@@ -0,0 +1,34 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# 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 Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Module_Module,sane))
+
+$(eval $(call gb_Module_add_targets,sane,\
+ Package_inc \
+))
diff --git a/sane/Package_inc.mk b/sane/Package_inc.mk
new file mode 100644
index 0000000..f5816d8
--- /dev/null
+++ b/sane/Package_inc.mk
@@ -0,0 +1,32 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# 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 Initial Developer of the Original Code is
+# Peter Foley <pefoley2 at verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Package_Package,sane_inc,$(SRCDIR)/sane/inc))
+
+$(eval $(call gb_Package_add_file,sane_inc,inc/external/sane/sane.h,sane.h))
diff --git a/sane/prj/build.lst b/sane/prj/build.lst
index c1c6fb9..a6576eb 100644
--- a/sane/prj/build.lst
+++ b/sane/prj/build.lst
@@ -1,3 +1,2 @@
sa sane : solenv NULL
-sa sane usr1 - all sa_mkout NULL
-sa sane\prj get - all sa_prj NULL
+sa sane\prj nmake - all sa_prj NULL
diff --git a/sane/prj/d.lst b/sane/prj/d.lst
index f592821..e69de29 100644
--- a/sane/prj/d.lst
+++ b/sane/prj/d.lst
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\sane
-..\inc\sane.h %_DEST%\inc\external\sane\sane.h
diff --git a/sane/prj/makefile.mk b/sane/prj/makefile.mk
new file mode 100644
index 0000000..85b2566
--- /dev/null
+++ b/sane/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org 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 Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
More information about the Libreoffice-commits
mailing list