From: Mathieu Baudier Date: Fri, 18 Feb 2022 05:09:34 +0000 (+0100) Subject: Improve make build X-Git-Tag: argeo-suite-2.3.3~10 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=38bea9b08fc27d55b6b8c904adc30cb4155587b8 Improve make build --- diff --git a/Makefile b/Makefile index 7d4c9cb..1a4f101 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,8 @@ org.argeo.tp.jetty \ org.argeo.tp.eclipse.equinox \ org.argeo.tp.eclipse.rap \ org.argeo.tp.jcr \ -org.argeo.cms +org.argeo.cms \ +org.argeo.cms.eclipse.rap \ clean: rm -rf $(BUILD_BASE) diff --git a/org.argeo.app.theme.default/.project b/org.argeo.app.theme.default/.project index 77b8e04..1a71c08 100644 --- a/org.argeo.app.theme.default/.project +++ b/org.argeo.app.theme.default/.project @@ -5,11 +5,6 @@ - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.pde.ManifestBuilder @@ -28,6 +23,5 @@ org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature diff --git a/org.argeo.app.theme.default/src/.gitignore b/org.argeo.app.theme.default/src/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/org.argeo.app.theme.default/src/rap/work.css b/org.argeo.app.theme.default/src/rap/work.css deleted file mode 100644 index c0aaeb1..0000000 --- a/org.argeo.app.theme.default/src/rap/work.css +++ /dev/null @@ -1,181 +0,0 @@ -.argeo-suite-header { - color: white; - background-color: #00294b; -} - -.argeo-suite-headerTitle { - font: bold 18px sans-serif; - color: white; - background-color: #00294b; -} - -.argeo-suite-leadPane { - background-color: #eee; -} - -Label.argeo-suite-leadPane { - font: 14px sans-serif; - color: #888; - background-color: #eee; -} - -Button.argeo-suite-leadPane:hover { - cursor:pointer; -} - -.argeo-suite-recentItems { - font: bold 14px sans-serif; - color: white; - background-color: #00294b; - padding: 8px 16px; -} - -.argeo-suite-titleContainer { - background-color: #00294b; - padding: 6px 8px 4px 8px; -} - -.argeo-suite-titleLabel { - font: bold 14px sans-serif; - color: white; - background-color: #00294b; -} - -.argeo-suite-subTitleLabel { - font: italic 14px sans-serif; - color: #777; - padding: 4px 8px; -} - -.argeo-suite-simpleLabel { - font: bold 14px sans-serif; - padding: 0px; -} - -.argeo-suite-simpleText { - font: 14px sans-serif; - padding: 0px; -} - -.argeo-suite-titleCell { - font: bold 14px sans-serif; - background-color: #ddd; -} - -.argeo-suite-inlineButton { - padding: 0px 4px; - font: 12px sans-serif; - border: 1px solid white; - color: white; - background-image: none; - background-color: #00294b; -} - -.argeo-suite-inlineButton:hover { - color: #00294b; - background-color: white; -} - -Composite.argeo-suite-mainTabBody { - background-color: #eee; - border: 1px solid #bbb; -} - -.argeo-suite-mainTab { - background-color: #eee; - border: 1px solid #888; -} - -ToolItem.argeo-suite-mainTab { - border: none; - background-color: #eee; -} - -ToolItem.argeo-suite-mainTab:hover { - background-color: #eee; -} - - -Button.argeo-suite-mainTab { - border: 1px solid #eee; - background-color: #eee; -} - -.argeo-suite-mainTab:hover { - background-color: #eee; -} - -Button.argeo-suite-mainTab:hover { - cursor: pointer; - background-color: #eee; -} - -.argeo-suite-mainTabSelected { - font: bold 14px sans-serif; - color: white; - /*background-color: #00294b;*/ - background-color: #5882b5; - border:1px solid #888; -} - -ToolItem.argeo-suite-mainTabSelected { - border: none; -} - -ToolItem.argeo-suite-mainTabSelected:hover { - background-color: #5882b5; -} - -Button.argeo-suite-mainTabSelected { - border: none; -} - -Sash { - border: 1px solid white; - background-image: none; - background-color: white; -} - -Sash:hover { - border: 1px solid #5882b5; - background-color: #5882b5; -} - -TreeItem{ - background-color:#fff; -} - -Tree-RowOverlay:selected { - color:#fff; - background-color:#5882b5; -} - -TableItem{ - background-color:#fff; -} - -Table-RowOverlay:selected { - color:#fff; - background-color:#5882b5; -} - -.argeo-suite-navigationBar{ - background-color:#ddd; -} - -.argeo-suite-navigationTitle{ - background-color:#ddd; - font:bold 14px sans-serif; -} - -.argeo-suite-navigationButton{ - color:#777; - background-color:#ddd; - font:bold 14px sans-serif; -} - -.argeo-suite-navigationButton:hover{ - cursor:pointer; - color:#ddd; - background-color:#777; -} diff --git a/org.argeo.app.theme.default/src/swt/app.css b/org.argeo.app.theme.default/src/swt/app.css deleted file mode 100644 index 4ac745d..0000000 --- a/org.argeo.app.theme.default/src/swt/app.css +++ /dev/null @@ -1,129 +0,0 @@ -.argeo-suite-header { - color: white; - background-color: #00294b; -} - -.argeo-suite-headerTitle { - font: bold 14px sans-serif; - color: white; - background-color: #00294b; -} - -.argeo-suite-leadPane { - background-color: #eee; -} - -Label.argeo-suite-leadPane { - font: 11px sans-serif; - color: #888; - background-color: #eee; -} - -Button.argeo-suite-leadPane:hover { - cursor: pointer; -} - -.argeo-suite-recentItems { - font: bold 13px sans-serif; - color: white; - background-color: #00294b; - padding: 8px 16px; -} - -.argeo-suite-titleContainer { - background-color: #00294b; -} - -.argeo-suite-titleLabel { - font: bold 13px sans-serif; - margin: 6px 8px 4px 8px; - color: white; - background-color: #00294b; -} - -.argeo-suite-subTitleLabel { - font: italic 14px sans-serif; - color: #777; - margin: 4px 8px; -} - -.argeo-suite-formLine { - padding: 4px 8px 4px 16px; -} - -.argeo-suite-simpleLabel { - font: normal 11px sans-serif; - border: 8px solid #eee; -} - -.argeo-suite-simpleText { - -} - -.argeo-suite-simpleInput { - padding: 4px 8px 4px 8px; -} - -.argeo-suite-titleCell { - font: bold 11px sans-serif; - background-color: #ddd; -} - -.argeo-suite-inlineButton { - padding: 0px 4px; - font: 12px sans-serif; - border: 1px solid white; - color: white; - background-image: none; - background-color: #00294b; -} - -.argeo-suite-inlineButton:hover { - color: #00294b; - background-color: white; -} - -Composite.argeo-suite-mainTabBody { - background-color: #eee; - border: 1px solid #bbb; -} - -.argeo-suite-mainTab { - background-color: #eee; - border: 1px solid #bbb; -} - -ToolItem.argeo-suite-mainTab { - border: none; - background-color: #eee; -} - -Button.argeo-suite-mainTab { - border: none; - background-color: #eee; -} - -.argeo-suite-mainTab:hover { - background-color: #eee; -} - -Button.argeo-suite-mainTab:hover { - cursor: pointer; - background-color: #eee; -} - -.argeo-suite-mainTabSelected { - font: bold 14px sans-serif; - color: white; - /*background-color: #00294b;*/ - background-color: #5882b5; - border: 1px solid #00294b; -} - -ToolItem.argeo-suite-mainTabSelected { - border: none; -} - -Button.argeo-suite-mainTabSelected { - border: none; -} \ No newline at end of file diff --git a/sdk/excludes.txt b/sdk/excludes.txt new file mode 100644 index 0000000..3f5b4e5 --- /dev/null +++ b/sdk/excludes.txt @@ -0,0 +1,8 @@ +src +target +.* +bnd.bnd +pom.xml +build.properties +bin +generated \ No newline at end of file diff --git a/sdk/osgi.mk b/sdk/osgi.mk index 25491f5..caa42da 100644 --- a/sdk/osgi.mk +++ b/sdk/osgi.mk @@ -50,6 +50,7 @@ $(BUILD_BASE)/jars-built: $(BNDS) $(BUILD_BASE)/%/bnd.bnd : %/bnd.bnd $(BUILD_BASE)/java-compiled mkdir -p $(dir $@)bin rsync -r --exclude "*.java" $(dir $<)src/ $(dir $@)bin + rsync -r --exclude-from $(SDK_SRC_BASE)/sdk/excludes.txt $(dir $<) $(dir $@)bin if [ -d "$(dir $<)OSGI-INF" ]; then rsync -r $(dir $<)OSGI-INF/ $(dir $@)/OSGI-INF; fi cp $< $@ echo "\n-sourcepath:$(SDK_SRC_BASE)/$(dir $<)src\n" >> $@