Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dynamic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MostafaMollaali
dynamic
Commits
d8ae0ef4
Commit
d8ae0ef4
authored
6 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[web] Cleanup
parent
66eb63ae
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+0
-1
0 additions, 1 deletion
CMakeLists.txt
scripts/cmake/Web.cmake
+0
-63
0 additions, 63 deletions
scripts/cmake/Web.cmake
web/requirements.txt
+0
-1
0 additions, 1 deletion
web/requirements.txt
with
0 additions
and
65 deletions
CMakeLists.txt
+
0
−
1
View file @
d8ae0ef4
...
@@ -61,7 +61,6 @@ include(test/Test)
...
@@ -61,7 +61,6 @@ include(test/Test)
if
(
OGS_COVERAGE AND NOT IS_SUBPROJECT
)
if
(
OGS_COVERAGE AND NOT IS_SUBPROJECT
)
include
(
Coverage
)
include
(
Coverage
)
endif
()
endif
()
include
(
Web
)
####################
####################
### More Options ###
### More Options ###
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/Web.cmake
deleted
100644 → 0
+
0
−
63
View file @
66eb63ae
if
(
NOT NPM
)
return
()
endif
()
if
(
YARN
)
set
(
PACKAGE_MANAGER
${
YARN
}
)
else
()
set
(
PACKAGE_MANAGER
"
${
NPM
}
install"
)
endif
()
add_custom_target
(
web-install
COMMAND
${
PACKAGE_MANAGER
}
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
/web
BYPRODUCTS
${
PROJECT_SOURCE_DIR
}
/web/node_modules
)
if
(
PIP AND PYTHON_EXECUTABLE AND
(
EXISTS
${
PROJECT_SOURCE_DIR
}
/web/import/secret.py OR
DEFINED ENV{CONTENTFUL_ACCESS_TOKEN}
))
add_custom_target
(
web-import
COMMAND
${
PIP
}
install -r ../requirements.txt
COMMAND
${
PYTHON_EXECUTABLE
}
import.py
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
/web/import
DEPENDS web-install
)
set
(
IMPORT_TARGET web-import
)
else
()
message
(
STATUS
"[web] Skipping import from Contentful!"
)
endif
()
if
(
PANDOC_CITEPROC
)
add_custom_target
(
web-bib-convert
COMMAND
${
PANDOC_CITEPROC
}
--bib2json
${
PROJECT_SOURCE_DIR
}
/Documentation/bibliography.bib >
${
PROJECT_SOURCE_DIR
}
/web/data/bibliography.json
)
set
(
BIB_CONVERT_TARGET web-bib-convert
)
endif
()
if
(
DEFINED OGS_WEB_BASE_URL
)
set
(
HUGO_ARGS --baseURL
${
OGS_WEB_BASE_URL
}
)
endif
()
if
(
DEFINED ENV{JENKINS_URL}
)
if
(
$ENV{JOB_NAME} STREQUAL
"ufz/ogs/master"
)
set
(
HUGO_BASE_URL
"https://docs.opengeosys.org"
)
else
()
set
(
HUGO_BASE_URL
"$ENV{JOB_URL}Web/"
)
endif
()
set
(
HUGO_ARGS
${
HUGO_ARGS
}
--baseURL
${
HUGO_BASE_URL
}
)
endif
()
add_custom_target
(
web
COMMAND node_modules/.bin/webpack -p
COMMAND hugo
${
HUGO_ARGS
}
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
/web
DEPENDS web-install
${
IMPORT_TARGET
}
${
BIB_CONVERT_TARGET
}
)
add_custom_target
(
web-clean
COMMAND
${
NPM
}
run clean
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
/web
)
This diff is collapsed.
Click to expand it.
web/requirements.txt
deleted
100644 → 0
+
0
−
1
View file @
66eb63ae
requests==2.12.4
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment